sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE: fix a crash with previous scene destruction speed up commit when sensors and controllers are cross connected between objects.

Browse Source
This commit is contained in:
Benoit Bolsee 2009-05-03 21:42:39 +00:00
parent f67ffd137d
commit 20888482ae
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/gameengine/GameLogic/SCA_LogicManager.cpp
View File

@ -193,10 +193,20 @@ void SCA_LogicManager::RemoveSensor(SCA_ISensor* sensor)
void SCA_LogicManager::RemoveController(SCA_IController* controller) void SCA_LogicManager::RemoveController(SCA_IController* controller)
{ {
sensormap_t::iterator sit;
sit = m_sensorcontrollermapje.begin();
if (sit==m_sensorcontrollermapje.end())
{
//TRICK: either there is no sensor at all, or the scene is being deleted
//(see KX_Scene::~KX_Scene()). In the first case, this is harmless.
//In the second case, we cannot rely on the sensor being still available,
//make the controller inactive to avoid link count.
//Need a better solution, maybe something similar to m_removedActuators.
controller->SetActive(false);
}
controller->UnlinkAllSensors(); controller->UnlinkAllSensors();
controller->UnlinkAllActuators(); controller->UnlinkAllActuators();
sensormap_t::iterator sit; for (;!(sit==m_sensorcontrollermapje.end());++sit)
for (sit = m_sensorcontrollermapje.begin();!(sit==m_sensorcontrollermapje.end());++sit)
{ {
(*sit).second.remove(controller); (*sit).second.remove(controller);
} }