Changeset 1752

Timestamp:

Sep 9, 2008, 8:28:24 PM (16 years ago)

Author:

landauf

Message:

• removed #include "core/CoreIncludes.h" from Gamestate.h and put it into the .cc files
• removed a warning in Client.cc

Location:

code/trunk/src

Files:

• network/Client.cc (modified) (5 diffs)
• network/GamestateClient.h (modified) (1 diff)
• network/Server.cc (modified) (1 diff)
• network/packet/Gamestate.cc (modified) (3 diffs)
• network/packet/Gamestate.h (modified) (2 diffs)
• orxonox/Orxonox.cc (modified) (2 diffs)

code/trunk/src/network/Client.cc

@@ -50 +50 @@
 {
 //   SetConsoleCommandShortcut(Client, chat);
-  
-  
+
+
   /**
   * Constructor for the Client class
@@ -92 +92 @@
       closeConnection();
   }
-  
+
   /**
   * Establish the Connection to the Server
@@ -121 +121 @@
     return client_connection.addPacket(packet);
   }
-  
+
   bool Client::processChat(packet::Chat *message, unsigned int clientID){
     return message->process();
   }
-  
+
   /*bool Client::sendChat(packet::Chat *chat){
     chat->process();
@@ -131 +131 @@
     return p->send();
   }*/
-  
+
 
   /**
@@ -173 +173 @@
     if(gameStateID==GAMESTATEID_INITIAL)
       if(gameStateFailure_){
-        packet::Acknowledgement *ack = new packet::Acknowledgement(GAMESTATEID_INITIAL, 0);
+        packet::Acknowledgement *ack = new packet::Acknowledgement((unsigned int)GAMESTATEID_INITIAL, 0);
         if(!ack->send())
           COUT(3) << "could not (negatively) ack gamestate" << std::endl;
-        else 
+        else
           COUT(4) << "negatively acked a gamestate" << std::endl;
         }

code/trunk/src/network/GamestateClient.h

@@ -67 +67 @@
   private:
     packet::Gamestate *processGamestate(packet::Gamestate *gs);
-    void removeObject(orxonox::ObjectList<Synchronisable>::iterator &it);
+    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
     void printGamestateMap();
     bool saveShipCache();

code/trunk/src/network/Server.cc

@@ -50 +50 @@
 #include "objects/SpaceShip.h"
 #include "core/ConsoleCommand.h"
+#include "core/CoreIncludes.h"
 #include "core/Iterator.h"
 #include "packet/Chat.h"

code/trunk/src/network/packet/Gamestate.cc

@@ -30 +30 @@
 #include "network/ClientInformation.h"
 #include "network/GamestateHandler.h"
+#include "core/CoreIncludes.h"
 #include "core/Iterator.h"
 
@@ -267 +268 @@
   assert(HEADER->crc32==calcCRC(ndata+sizeof(GamestateHeader), HEADER->normsize));
 #endif
-  
+
   //copy over the header
   *GAMESTATE_HEADER(ndata) = *HEADER;
@@ -386 +387 @@
     return HEADER->compressed;
   }
-  
+
   int Gamestate::getBaseID(){
     return HEADER->base_id;

code/trunk/src/network/packet/Gamestate.h

@@ -32 +32 @@
 #include "util/CRC32.h"
 #endif
-#include "core/CoreIncludes.h"
 
 #ifndef NETWORK_PACKETGAMESTATE_H
@@ -83 +82 @@
   private:
     unsigned int calcGamestateSize(unsigned int id, int mode=0x0);
-    void removeObject(orxonox::ObjectList<Synchronisable>::iterator &it);
+    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
 
 

code/trunk/src/orxonox/Orxonox.cc

@@ -54 +54 @@
 // core
 #include "core/ConfigFileManager.h"
+#include "core/CoreIncludes.h"
 #include "core/Iterator.h"
 #include "core/ConsoleCommand.h"
@@ -185 +186 @@
         it->setSpeedFactor(it->getSpeedFactor() * change);
 
-    for (Iterator<Backlight> it = ObjectList<Backlight>::begin(); it; ++it)
+    for (ObjectList<Backlight>::iterator it = ObjectList<Backlight>::begin(); it; ++it)
         it->setTimeFactor(Orxonox::getSingleton()->getTimeFactor());
   }