Changeset 7777 for code/branches/network5/src/orxonox

Timestamp:

Dec 19, 2010, 2:27:06 PM (14 years ago)

Author:

scheusso

Message:

some () structural changes
some functional changes (GamestateClient replaced through GamestateManager on client)
reliable packets get buffered until a recent gamestate arrived and got processed

Location:

code/branches/network5/src/orxonox

Files:

• PlayerManager.cc (modified) (1 diff)
• gametypes/Gametype.cc (modified) (2 diffs)
• infos/HumanPlayer.cc (modified) (2 diffs)
• worldentities/pawns/Spectator.cc (modified) (1 diff)

code/branches/network5/src/orxonox/PlayerManager.cc

@@ -54 +54 @@
     void PlayerManager::clientConnected(unsigned int clientID)
     {
+      COUT(0) << "PlayerManager: client connected with id: " << clientID << endl;
         if (GameMode::isMaster())
         {

code/branches/network5/src/orxonox/gametypes/Gametype.cc

@@ -171 +171 @@
     void Gametype::playerEntered(PlayerInfo* player)
     {
+      COUT(0) << "Gametype: playerentered" << endl;
         this->players_[player].state_ = PlayerState::Joined;
     }
@@ -411 +412 @@
     void Gametype::spawnPlayer(PlayerInfo* player)
     {
+      COUT(0) << "Gametype: spawnPlayer" << endl;
         SpawnPoint* spawnpoint = this->getBestSpawnPoint(player);
         if (spawnpoint)

code/branches/network5/src/orxonox/infos/HumanPlayer.cc

@@ -45 +45 @@
     HumanPlayer::HumanPlayer(BaseObject* creator) : PlayerInfo(creator)
     {
+      COUT(0) << "new HumanPlayer" << endl;
         RegisterObject(HumanPlayer);
 
@@ -133 +134 @@
     void HumanPlayer::networkcallback_client_initialized()
     {
+      COUT(0) << "networkcallback_client_initialized" << endl;
         if (this->getGametype())
             this->getGametype()->playerEntered(this);

code/branches/network5/src/orxonox/worldentities/pawns/Spectator.cc

@@ -43 +43 @@
     Spectator::Spectator(BaseObject* creator) : ControllableEntity(creator)
     {
+      COUT(0) << "creating specator" << endl;
         RegisterObject(Spectator);