mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 09:23:53 +00:00
Code Issues Releases Wiki Activity

Fix setWaterLevel script instruction not affecting physics

Browse source
This commit is contained in:
scrawl 2015-02-08 15:39:10 +01:00
parent 01e32aef79
commit ad8790fba0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -723,9 +723,9 @@ namespace MWSound
MWWorld::Ptr player = MWWorld::Ptr player =
MWBase::Environment::get().getWorld()->getPlayerPtr(); MWBase::Environment::get().getWorld()->getPlayerPtr();
const ESM::Cell *cell = player.getCell()->getCell(); const MWWorld::CellStore *cell = player.getCell();
mListenerUnderwater = ((cell->mData.mFlags&cell->HasWater) && mListenerPos.z < cell->mWater); mListenerUnderwater = ((cell->getCell()->mData.mFlags&ESM::Cell::HasWater) && mListenerPos.z < cell->getWaterLevel());
} }
void SoundManager::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated) void SoundManager::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)

8
apps/openmw/mwworld/physicssystem.cpp
View file

@ -862,9 +862,9 @@ namespace MWWorld
for(;iter != mMovementQueue.end();++iter) for(;iter != mMovementQueue.end();++iter)
{ {
float waterlevel = -std::numeric_limits<float>::max(); float waterlevel = -std::numeric_limits<float>::max();
const ESM::Cell *cell = iter->first.getCell()->getCell(); const MWWorld::CellStore *cell = iter->first.getCell();
if(cell->hasWater()) if(cell->getCell()->hasWater())
waterlevel = cell->mWater; waterlevel = cell->getWaterLevel();
float oldHeight = iter->first.getRefData().getPosition().pos[2]; float oldHeight = iter->first.getRefData().getPosition().pos[2];
@ -872,7 +872,7 @@ namespace MWWorld
bool waterCollision = false; bool waterCollision = false;
if (effects.get(ESM::MagicEffect::WaterWalking).getMagnitude() if (effects.get(ESM::MagicEffect::WaterWalking).getMagnitude()
&& cell->hasWater() && cell->getCell()->hasWater()
&& !world->isUnderwater(iter->first.getCell(), && !world->isUnderwater(iter->first.getCell(),
Ogre::Vector3(iter->first.getRefData().getPosition().pos))) Ogre::Vector3(iter->first.getRefData().getPosition().pos)))
waterCollision = true; waterCollision = true;