[Orxonox-commit 1111] r5832 - code/branches/core5/src/modules/gamestates
landauf at orxonox.net
landauf at orxonox.net
Mon Sep 28 23:31:40 CEST 2009
Author: landauf
Date: 2009-09-28 23:31:39 +0200 (Mon, 28 Sep 2009)
New Revision: 5832
Modified:
code/branches/core5/src/modules/gamestates/GSLevel.cc
Log:
fixed crash because of the unloading of HumanPlayer
Modified: code/branches/core5/src/modules/gamestates/GSLevel.cc
===================================================================
--- code/branches/core5/src/modules/gamestates/GSLevel.cc 2009-09-28 20:48:47 UTC (rev 5831)
+++ code/branches/core5/src/modules/gamestates/GSLevel.cc 2009-09-28 21:31:39 UTC (rev 5832)
@@ -164,6 +164,9 @@
if (GameMode::showsGraphics())
{
+ // disconnect the HumanPlayer
+ this->playerManager_->clientDisconnected(0);
+
// unload all compositors (this is only necessary because we don't yet destroy all resources!)
Ogre::CompositorManager::getSingleton().removeAll();
}
@@ -176,9 +179,6 @@
if (GameMode::showsGraphics())
{
- // disconnect the HumanPlayer
- this->playerManager_->clientDisconnected(0);
-
InputManager::getInstance().leaveState("game");
}
More information about the Orxonox-commit
mailing list