Changeset 9656 in orxonox.OLD for trunk/src/lib/network/player_stats.cc

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/lib/network/player_stats.cc (modified) (14 diffs)

trunk/src/lib/network/player_stats.cc

@@ -41 +41 @@
   init();
 
-  this->userId = userId;
+  this->assignedUserId = userId;
 }
 
@@ -56 +56 @@
   this->setClassID( CL_PLAYER_STATS, "PlayerStats" );
 
-  this->userId = 0;
+  this->assignedUserId = 0;
   this->teamId = TEAM_NOTEAM;
   this->preferedTeamId = TEAM_NOTEAM;
@@ -65 +65 @@
   this->oldNickName = "Player";
 
-  userId_handle = registerVarId( new SynchronizeableInt( &userId, &userId, "userId" ) );
-  teamId_handle = registerVarId( new SynchronizeableInt( &teamId, &teamId, "teamId" ) );
-  preferedTeamId_handle = registerVarId( new SynchronizeableInt( &preferedTeamId, &preferedTeamId, "preferedUserId" ) );
-  score_handle = registerVarId( new SynchronizeableInt( &score, &score, "score" ) );
-  playableClassId_handle = registerVarId( new SynchronizeableInt( &playableClassId, &playableClassId, "playableClassId") );
-  playableUniqueId_handle = registerVarId( new SynchronizeableInt( &playableUniqueId, &playableUniqueId, "playableUniqueId" ) );
-  modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName" ) );
-  nickName_handler = registerVarId( new SynchronizeableString( &nickName, &nickName, "nickName" ) );
+  userId_handle = registerVarId( new SynchronizeableInt( &assignedUserId, &assignedUserId, "userId", PERMISSION_MASTER_SERVER ) );
+  teamId_handle = registerVarId( new SynchronizeableInt( &teamId, &teamId, "teamId", PERMISSION_MASTER_SERVER ) );
+  preferedTeamId_handle = registerVarId( new SynchronizeableInt( &preferedTeamId, &preferedTeamId, "preferedUserId", PERMISSION_MASTER_SERVER ) );
+  score_handle = registerVarId( new SynchronizeableInt( &score, &score, "score", PERMISSION_MASTER_SERVER ) );
+  playableClassId_handle = registerVarId( new SynchronizeableInt( &playableClassId, &playableClassId, "playableClassId", PERMISSION_MASTER_SERVER) );
+  playableUniqueId_handle = registerVarId( new SynchronizeableInt( &playableUniqueId, &playableUniqueId, "playableUniqueId", PERMISSION_MASTER_SERVER ) );
+  modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName", PERMISSION_MASTER_SERVER ) );
+  nickName_handler = registerVarId( new SynchronizeableString( &nickName, &nickName, "nickName", PERMISSION_MASTER_SERVER ) );
 
   MessageManager::getInstance()->registerMessageHandler( MSGID_CHANGENICKNAME, changeNickHandler, NULL );
 
-  PRINTF(0)("PlayerStats created\n");
+  PRINTF(5)("PlayerStats created\n");
 }
 
@@ -84 +84 @@
  */
 PlayerStats::~PlayerStats()
-{
-}
-
-
- /**
- * override this function to be notified on change
- * of your registred variables.
- * @param id id's which have changed
-  */
+{}
+
+
+/**
+* override this function to be notified on change
+* of your registred variables.
+* @param id id's which have changed
+ */
 void PlayerStats::varChangeHandler( std::list< int > & id )
 {
@@ -99 +98 @@
     this->setPlayableUniqueId( this->playableUniqueId );
 
-    PRINTF(0)("uniqueID changed %d %d %d\n", userId, SharedNetworkData::getInstance()->getHostID(), getUniqueID());
+    PRINTF(4)("uniqueID changed %d %d %d\n", assignedUserId, SharedNetworkData::getInstance()->getHostID(), getUniqueID());
   }
 
@@ -105 +104 @@
   {
     PRINTF(0)("user %s is now known as %s\n", oldNickName.c_str(), nickName.c_str());
-    oldNickName = nickName;
-  }
-}
+    this->oldNickName = nickName;
+  }
+
+  if ( std::find( id.begin(), id.end(), preferedTeamId_handle) != id.end() )
+  {
+    PRINTF(0)("user %s has changed team to %i\n", nickName.c_str(), this->teamId);
+  }
+}
+
+
 
 /**
@@ -123 +129 @@
   }
 
-  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
-  {
-    if ( dynamic_cast<PlayerStats*>(*it)->getUserId() == userId )
+  for ( std::list<BaseObject*>::const_iterator it = list->
+        begin();
+        it != list->end();
+        it++ )
+  {
+
+
+    if ( dynamic_cast<PlayerStats*>(*it)->getAssignedUserId() == userId )
     {
       return dynamic_cast<PlayerStats*>(*it);
@@ -148 +159 @@
 
   this->playable = NULL;
-  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
-  {
-    if ( dynamic_cast<Playable*>(*it)->getUniqueID() == uniqueId )
+  for ( std::list<BaseObject*>::const_iterator it = list->
+        begin();
+        it != list->end();
+        it++ )
+  {
+    if ( dynamic_cast<Playable*>(*it)->
+         getUniqueID() == uniqueId )
     {
       this->playable = dynamic_cast<Playable*>(*it);
@@ -159 +174 @@
   }
 
-  if ( this->playable && userId == SharedNetworkData::getInstance()->getHostID() )
+  if ( this->playable && this->assignedUserId == SharedNetworkData::getInstance()
+       ->getHostID() )
   {
     State::getPlayer()->setPlayable( this->playable );
+    // also set the team id
   }
 
@@ -204 +221 @@
     assert( Converter::stringToByteArray( nick, data, nick.length()+INTSIZE) == nick.length()+INTSIZE );
 
-    MessageManager::getInstance()->sendMessage( MSGID_CHANGENICKNAME, data, nick.length()+INTSIZE, RT_SERVER, 0, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( MSGID_CHANGENICKNAME, data, nick.length()+INTSIZE, RT_SERVER, NET_MASTER_SERVER, MP_HIGHBANDWIDTH );
     return;
   }
 }
 
-bool PlayerStats::changeNickHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
+/**
+ * handler for the nick name
+ * @param messageType type of the message
+ * @param data  data of the message
+ * @param dataLength length of the data
+ * @param someData some additional data
+ * @param senderId userId of the sender
+ * @param destinationId userId of the rec
+ * @return true if handled correctly
+ */
+bool PlayerStats::changeNickHandler( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  )
 {
   std::string newNick;
@@ -216 +243 @@
   if ( res != dataLength )
   {
-    PRINTF(2)("invalid message size from user %d\n", userId);
+    PRINTF(2)("invalid message size from user %d\n", senderId);
     newNick = "invalid";
   }
 
-  if ( PlayerStats::getStats( userId ) )
-    PlayerStats::getStats( userId )->setNickName( newNick );
+  if ( PlayerStats::getStats( senderId) )
+    PlayerStats::getStats( senderId )->setNickName( newNick );
 
   return true;
 }
 
+/**
+ * sets the nick name from the shell
+ * @param newNick new prefered nick name
+ */
 void PlayerStats::shellNick( const std::string& newNick )
 {
@@ -236 +267 @@
 
 
+/**
+ * removes and delets all player stats
+ */
 void PlayerStats::deleteAllPlayerStats( )
 {
@@ -246 +280 @@
 
 
+/**
+ * @return the score list of this player stat
+ */
 ScoreList PlayerStats::getScoreList( )
 {
@@ -257 +294 @@
   }
 
-  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+  for ( std::list<BaseObject*>::const_iterator it = list->
+        begin();
+        it != list->end();
+        it++ )
   {
     PlayerStats & stats = *dynamic_cast<PlayerStats*>(*it);