mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-24 02:39:42 +00:00
Code Issues Releases Wiki Activity

fixed collision toggling bug

Browse source
This commit is contained in:
Marc Zinnschlag 2011-10-29 09:50:11 +02:00
parent c3a492bf74
commit 33ecd8b66c
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,5 @@
#include <stdexcept>
#include "physicssystem.hpp" #include "physicssystem.hpp"
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
#include "../mwworld/world.hpp" // FIXME #include "../mwworld/world.hpp" // FIXME
@ -153,8 +155,11 @@ namespace MWWorld
bool PhysicsSystem::toggleCollisionMode() bool PhysicsSystem::toggleCollisionMode()
{ {
for(std::map<std::string,OEngine::Physic::PhysicActor*>::iterator it = mEngine->PhysicActorMap.begin(); it != mEngine->PhysicActorMap.end();it++) for(std::map<std::string,OEngine::Physic::PhysicActor*>::iterator it = mEngine->PhysicActorMap.begin(); it != mEngine->PhysicActorMap.end();it++)
{
if (it->first=="player")
{ {
OEngine::Physic::PhysicActor* act = it->second; OEngine::Physic::PhysicActor* act = it->second;
bool cmode = act->getCollisionMode(); bool cmode = act->getCollisionMode();
if(cmode) if(cmode)
{ {
@ -173,9 +178,9 @@ namespace MWWorld
return true; return true;
} }
} }
}
return false; // This should never happen, but it shall not bother us now, since throw std::logic_error ("can't find player");
// this part of the code needs a rewrite anyway.
} }
} }