Changeset 2907 for code/branches/questsystem5/src/orxonox/objects/controllers/HumanController.cc

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/controllers/HumanController.cc (modified) (2 diffs)

code/branches/questsystem5/src/orxonox/objects/controllers/HumanController.cc

@@ -35 +35 @@
 #include "objects/worldentities/pawns/Pawn.h"
 #include "objects/gametypes/Gametype.h"
+#include "objects/infos/PlayerInfo.h"
 
 namespace orxonox
@@ -157 +158 @@
             if (pawn)
                 pawn->kill();
+            else if (HumanController::localController_s->player_)
+                HumanController::localController_s->player_->stopControl(HumanController::localController_s->controllableEntity_);
         }
     }