Changeset 2836 for code/branches/netp2/src/orxonox/objects/worldentities/pawns

Timestamp:

Mar 23, 2009, 5:00:54 PM (16 years ago)

Author:

scheusso

Message:

merge old netp branch to netp2 (still because of multiplayer pong…)

File:

• code/branches/netp2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/netp2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -129 +129 @@
         this->firehack_ = 0x0;
 
-        if (this->health_ <= 0)
+        if (Core::isMaster())
+          if (this->health_ <= 0)
             this->death();
     }