Changeset 9499 in orxonox.OLD for branches/proxy/src

Timestamp:

Jul 27, 2006, 12:10:08 PM (18 years ago)

Author:

patrick

Message:

team id is supported

Location:

branches/proxy/src

Files:

• lib/network/network_game_manager.cc (modified) (3 diffs)
• world_entities/playable.h (modified) (1 diff)

branches/proxy/src/lib/network/network_game_manager.cc

@@ -233 +233 @@
 bool NetworkGameManager::preferedTeamHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
 {
-  assert( SharedNetworkData::getInstance()->isMasterServer() ||  SharedNetworkData::getInstance()->isProxyServerActive());
+  assert( SharedNetworkData::getInstance()->isMasterServer() /*||  SharedNetworkData::getInstance()->isProxyServerActive()*/);
 
   int teamId = 0;
@@ -249 +249 @@
 }
 
+
+/**
+ * this actualy sets the new prefered team id
+ * @param userId: the user that changes team
+ * @param teamId: the new team id for the user
+ */
 void NetworkGameManager::setPreferedTeam( int userId, int teamId )
 {
@@ -258 +264 @@
   stats.setPreferedTeamId( teamId );
 }
+
 
 /**

branches/proxy/src/world_entities/playable.h

@@ -72 +72 @@
   void setPlayDirection(float angle, float dirX, float dirY, float dirZ, float speed = 0.0f);
 
+  // Networking interface
   inline void setScore( int score ) { this->score = score; }
   inline int  getScore() { return this->score; }
+  virtual void setTeam(int teamId) {}
 
   void setEnterRadius(float radius) { this->enterRadius = radius; };