Changeset 8327 for code/trunk/src/orxonox/infos/PlayerInfo.cc
- Timestamp:
- Apr 25, 2011, 8:22:36 PM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/network6 (added) merged: 7823-7825,7875,7878,7881-7882,7898,7900,7931,8315
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/infos/PlayerInfo.cc
r7163 r8327 32 32 33 33 #include "core/CoreIncludes.h" 34 #include "network/ClientInformation.h"34 // #include "network/ClientInformation.h" 35 35 #include "gametypes/Gametype.h" 36 36 #include "worldentities/ControllableEntity.h" … … 43 43 RegisterObject(PlayerInfo); 44 44 45 this->clientID_ = CLIENTID_UNKNOWN;45 this->clientID_ = NETWORK_PEER_ID_UNKNOWN; 46 46 this->bHumanPlayer_ = false; 47 47 this->bLocalPlayer_ = false;
Note: See TracChangeset
for help on using the changeset viewer.