- Timestamp:
- Apr 6, 2009, 1:59:00 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gui merged: 2796,2798-2801,2805,2807-2808,2811,2814-2817,2834,2840-2850,2853-2854,2859,2862-2863,2869,2875,2887,2892
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc
r2893 r2896 30 30 #include "Pawn.h" 31 31 32 #include "core/ Core.h"32 #include "core/GameMode.h" 33 33 #include "core/CoreIncludes.h" 34 34 #include "core/XMLPort.h" … … 63 63 this->getPickUp().setPlayer(this); 64 64 65 if ( Core::isMaster())65 if (GameMode::isMaster()) 66 66 { 67 67 this->weaponSystem_ = new WeaponSystem(this); … … 211 211 this->getPlayer()->stopControl(this); 212 212 213 if ( Core::isMaster())213 if (GameMode::isMaster()) 214 214 this->deatheffect(); 215 215 } … … 260 260 { 261 261 this->setHealth(this->initialHealth_); 262 if ( Core::isMaster())262 if (GameMode::isMaster()) 263 263 this->spawneffect(); 264 264 }
Note: See TracChangeset
for help on using the changeset viewer.