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

Avoid Ogre exceptions and null pointers.

Browse source
This commit is contained in:
cc9cii 2014-10-23 20:14:01 +11:00
parent 39cd89a9af
commit 2f26fc1188
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/opencs/view/world/physicssystem.cpp
View file

@ -170,12 +170,15 @@ namespace CSVWorld
mSelectedEntities.find(result.first);
if(iter != mSelectedEntities.end()) // currently selected
{
std::vector<std::string> deletedEntities = mSelectedEntities[result.first];
while(!deletedEntities.empty())
std::vector<std::string> clonedEntities = mSelectedEntities[result.first];
while(!clonedEntities.empty())
{
scene->detachObject(deletedEntities.back());
mSceneMgr->destroyEntity(deletedEntities.back());
deletedEntities.pop_back();
if(mSceneMgr->hasEntity(clonedEntities.back()))
{
scene->detachObject(clonedEntities.back());
mSceneMgr->destroyEntity(clonedEntities.back());
}
clonedEntities.pop_back();
}
mSelectedEntities.erase(iter);
@ -189,6 +192,9 @@ namespace CSVWorld
while(iter.hasMoreElements())
{
Ogre::MovableObject * element = iter.getNext();
if(!element)
break;
if(element->getMovableType() != "Entity")
continue;