Changeset 9574 in orxonox.OLD for branches/proxy/src/lib

Timestamp:

Jul 28, 2006, 5:01:38 PM (18 years ago)

Author:

patrick

Message:

found the bug, master-server proxy architecture is working correctly. yeaaa

Location:

branches/proxy/src/lib/network

Files:

• network_stream.cc (modified) (1 diff)
• player_stats.cc (modified) (8 diffs)
• player_stats.h (modified) (2 diffs)

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

@@ -538 +538 @@
   }
 
-  PRINTF(0)("Current number of connections is: %i\n", this->peers.size());
+  PRINT(0)(" Current number of connections is: %i\n", this->peers.size());
   for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
   {
-    PRINTF(0)("peers[%i] with uniqueId %i and address: %s\n", it->first, it->second.userId, it->second.ip.ipString().c_str());
-  }
+    PRINT(0)("  peers[%i] with uniqueId %i and address: %s\n", it->first, it->second.userId, it->second.ip.ipString().c_str());
+  }
+  PRINT(0)("\n\n");
 
 

branches/proxy/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" ) );
+  userId_handle = registerVarId( new SynchronizeableInt( &assignedUserId, &assignedUserId, "userId" ) );
   teamId_handle = registerVarId( new SynchronizeableInt( &teamId, &teamId, "teamId" ) );
   preferedTeamId_handle = registerVarId( new SynchronizeableInt( &preferedTeamId, &preferedTeamId, "preferedUserId" ) );
@@ -98 +98 @@
     this->setPlayableUniqueId( this->playableUniqueId );
 
-    PRINTF(0)("uniqueID changed %d %d %d\n", userId, SharedNetworkData::getInstance()->getHostID(), getUniqueID());
+    PRINTF(0)("uniqueID changed %d %d %d\n", assignedUserId, SharedNetworkData::getInstance()->getHostID(), getUniqueID());
   }
 
@@ -110 +110 @@
   {
     PRINTF(0)("user %s has changed team to %i\n", nickName.c_str(), this->teamId);
-    this->oldNickName = nickName;
   }
 }
@@ -135 +134 @@
         it++ )
   {
-    if ( dynamic_cast<PlayerStats*>(*it)->
-         getUserId() == userId )
+
+
+    if ( dynamic_cast<PlayerStats*>(*it)->getAssignedUserId() == userId )
     {
       return dynamic_cast<PlayerStats*>(*it);
@@ -150 +150 @@
 void PlayerStats::setPlayableUniqueId( int uniqueId )
 {
+  PRINTF(0)("set playable unique id %i\n", uniqueId);
   const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
 
@@ -174 +175 @@
   }
 
-  if ( this->playable && userId == SharedNetworkData::getInstance()
+  if ( this->playable && this->assignedUserId == SharedNetworkData::getInstance()
        ->getHostID() )
   {

branches/proxy/src/lib/network/player_stats.h

@@ -41 +41 @@
 
     static PlayerStats * getStats( int userId );
+    inline int getAssignedUserId(){ return this->assignedUserId; }
 
-    inline int getUserId(){ return userId; }
 
     inline int getTeamId(){ return teamId; }
@@ -89 +89 @@
     int              nickName_handler;
 
-    int              userId;                    //!< userId
+    int              assignedUserId;            //!< userId
     int              teamId;                    //!< teamId
     int              preferedTeamId;            //!< preferedTeamId