Changeset 8648

Timestamp:

May 28, 2011, 8:53:14 PM (13 years ago)

Author:

scheusso

Message:

some network related fixes

Location:

code/branches/presentation/src

Files:

• libraries/network/Server.cc (modified) (1 diff)
• libraries/network/packet/Welcome.cc (modified) (1 diff)
• libraries/network/packet/Welcome.h (modified) (1 diff)
• orxonox/infos/GametypeInfo.cc (modified) (1 diff)
• orxonox/items/Engine.cc (modified) (1 diff)
• orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
• orxonox/worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/branches/presentation/src/libraries/network/Server.cc

@@ -413 +413 @@
     
     COUT(4) << "sending welcome" << std::endl;
-    packet::Welcome *w = new packet::Welcome(clientID, OBJECTID_UNKNOWN);
+    packet::Welcome *w = new packet::Welcome(clientID);
     w->setPeerID(clientID);
     b = w->send( static_cast<Host*>(this) );

code/branches/presentation/src/libraries/network/packet/Welcome.cc

@@ -44 +44 @@
 #define _ENDIANTEST           _CLIENTID + sizeof(uint32_t)
 
-  Welcome::Welcome( uint32_t clientID, uint32_t shipID )
+  Welcome::Welcome( uint32_t clientID )
  : Packet()
 {

code/branches/presentation/src/libraries/network/packet/Welcome.h

@@ -41 +41 @@
 {
 public:
-  Welcome( uint32_t clientID, uint32_t shipID );
+  Welcome( uint32_t clientID );
   Welcome( uint8_t* data, uint32_t clientID );
   virtual ~Welcome();

code/branches/presentation/src/orxonox/infos/GametypeInfo.cc

@@ -342 +342 @@
         if(GameMode::isMaster())
         {
-            // Display "Press [Fire] to start the match" if the game has not yet ended.
-            if(!this->hasEnded())
-                NotificationListener::sendNotification("Press [Fire] to start the match", GametypeInfo::NOTIFICATION_SENDER, notificationMessageType::info, notificationSendMode::network, player->getClientID());
-            // Else display "Game has ended".
-            else
-                NotificationListener::sendNotification("Game has ended", GametypeInfo::NOTIFICATION_SENDER, notificationMessageType::info, notificationSendMode::network, player->getClientID());
+            if( player->isHumanPlayer() )
+            {
+                // Display "Press [Fire] to start the match" if the game has not yet ended.
+                if(!this->hasEnded())
+                    NotificationListener::sendNotification("Press [Fire] to start the match", GametypeInfo::NOTIFICATION_SENDER, notificationMessageType::info, notificationSendMode::network, player->getClientID());
+                // Else display "Game has ended".
+                else
+                    NotificationListener::sendNotification("Game has ended", GametypeInfo::NOTIFICATION_SENDER, notificationMessageType::info, notificationSendMode::network, player->getClientID());
+            }
         }
     }

code/branches/presentation/src/orxonox/items/Engine.cc

@@ -72 +72 @@
     Engine::~Engine()
     {
-
+        if( this->ship_ && this->ship_->hasEngine(this) )
+            this->ship_->removeEngine(this);
     }
 

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -374 +374 @@
     void SpaceShip::removeAllEngines()
     {
-        for(unsigned int i=0; i<this->engineList_.size(); i++)
-            this->engineList_[i]->destroy();
+        while(this->engineList_.size())
+            this->engineList_.back()->destroy();
+    }
+    
+    void SpaceShip::removeEngine(Engine* engine)
+    {
+        for(std::vector<Engine*>::iterator it=this->engineList_.begin(); it!=this->engineList_.end(); ++it)
+        {
+            if(*it==engine)
+            {
+                this->engineList_.erase(it);
+                return;
+            }
+        }
     }
 

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -66 +66 @@
             inline const std::vector<Engine*>& getEngineList()
                 { return this->engineList_; }
+            void removeEngine(Engine* engine);
             void removeAllEngines();