Changeset 7889 for code/trunk

Timestamp:

Feb 14, 2011, 8:24:00 PM (14 years ago)

Author:

landauf

Message:

hack-fix: overridden implementations of stopLocalHumanControl() were not called in multiplayer, which caused the "fire" command to not reset in Spectator

Location:

code/trunk/src/orxonox/worldentities

Files:

• ControllableEntity.cc (modified) (2 diffs)
• ControllableEntity.h (modified) (1 diff)
• pawns/Pawn.cc (modified) (1 diff)
• pawns/Pawn.h (modified) (1 diff)

code/trunk/src/orxonox/worldentities/ControllableEntity.cc

@@ -96 +96 @@
             this->bDestroyWhenPlayerLeft_ = false;
 
-            if (this->bHasLocalController_ && this->bHasHumanController_)
-                this->stopLocalHumanControl();
-
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
                 this->getPlayer()->stopControl();
@@ -133 +130 @@
     {
         SetConfigValue(mouseLookSpeed_, 3.0f);
+    }
+
+    void ControllableEntity::preDestroy()
+    {
+        // HACK - solve this clean and without preDestroy hook for multiplayer where removePlayer() isn't called
+        if (this->bHasLocalController_ && this->bHasHumanController_)
+            this->stopLocalHumanControl();
     }
 

code/trunk/src/orxonox/worldentities/ControllableEntity.h

@@ -157 +157 @@
 
         protected:
+            virtual void preDestroy();
+
             virtual void setPlayer(PlayerInfo* player); // don't call this directly, use friend class PlayerInfo instead
             virtual void removePlayer();                // don't call this directly, use friend class PlayerInfo instead

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -145 +145 @@
     }
 
+    void Pawn::preDestroy()
+    {
+        // yay, multiple inheritance!
+        this->ControllableEntity::preDestroy();
+        this->PickupCarrier::preDestroy();
+    }
+
     void Pawn::setPlayer(PlayerInfo* player)
     {

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -132 +132 @@
 
         protected:
+            virtual void preDestroy();
+
             virtual void setPlayer(PlayerInfo* player);
             virtual void removePlayer();