teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix crash for terrain without data, part 2

Browse source
This commit is contained in:
scrawl 2015-02-28 19:33:49 +01:00
parent 960e99c4f3
commit 2f2a95f735
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwworld/scene.cpp
View file

@ -199,7 +199,7 @@ namespace MWWorld
(*iter)->getCell()->getGridX(), (*iter)->getCell()->getGridX(),
(*iter)->getCell()->getGridY() (*iter)->getCell()->getGridY()
); );
if (land) if (land && land->mDataTypes&ESM::Land::DATA_VHGT)
mPhysics->removeHeightField ((*iter)->getCell()->getGridX(), (*iter)->getCell()->getGridY()); mPhysics->removeHeightField ((*iter)->getCell()->getGridX(), (*iter)->getCell()->getGridY());
} }

8
libs/openengine/bullet/physic.cpp
View file

@ -414,13 +414,17 @@ namespace Physic
+ boost::lexical_cast<std::string>(x) + "_" + boost::lexical_cast<std::string>(x) + "_"
+ boost::lexical_cast<std::string>(y); + boost::lexical_cast<std::string>(y);
HeightField hf = mHeightFieldMap [name]; HeightFieldContainer::iterator it = mHeightFieldMap.find(name);
if (it == mHeightFieldMap.end())
return;
const HeightField& hf = it->second;
mDynamicsWorld->removeRigidBody(hf.mBody); mDynamicsWorld->removeRigidBody(hf.mBody);
delete hf.mShape; delete hf.mShape;
delete hf.mBody; delete hf.mBody;
mHeightFieldMap.erase(name); mHeightFieldMap.erase(it);
} }
void PhysicEngine::adjustRigidBody(RigidBody* body, const Ogre::Vector3 &position, const Ogre::Quaternion &rotation, void PhysicEngine::adjustRigidBody(RigidBody* body, const Ogre::Vector3 &position, const Ogre::Quaternion &rotation,