Changeset 1960 for code/branches/objecthierarchy

Timestamp:

Oct 19, 2008, 11:53:31 PM (16 years ago)

Author:

landauf

Message:

• some unsigned int conversions (except gamestatemanager)
• small fix in Test

Location:

code/branches/objecthierarchy/src

Files:

• network/ClientInformation.cc (modified) (2 diffs)
• network/ClientInformation.h (modified) (1 diff)
• network/GamestateManager.cc (modified) (6 diffs)
• network/packet/Packet.cc (modified) (1 diff)
• orxonox/objects/Test.cc (modified) (2 diffs)
• orxonox/objects/worldentities/PositionableEntity.cc (modified) (1 diff)

code/branches/objecthierarchy/src/network/ClientInformation.cc

@@ -173 +173 @@
       return gamestateID_;
     else
-      return -1;
+      return (unsigned int)-1;
   }
 
@@ -180 +180 @@
       return partialGamestateID_;
     else
-      return -1;
+      return (unsigned int)-1;
   }
 

code/branches/objecthierarchy/src/network/ClientInformation.h

@@ -46 +46 @@
 #include <boost/thread/recursive_mutex.hpp>
 
-#define GAMESTATEID_INITIAL -1
-
 // WATCH OUT: THE CLIENTINFORMATION LIST IS NOT THREADSAFE ANYMORE
 
 namespace network
 {
+  static const unsigned int GAMESTATEID_INITIAL = (unsigned int)-1;
   static const unsigned int CLIENTID_UNKNOWN = (unsigned int)-2;
 

code/branches/objecthierarchy/src/network/GamestateManager.cc

@@ -64 +64 @@
     return getSnapshot();
   }
-  
+
   bool GamestateManager::add(packet::Gamestate *gs, int clientID){
     assert(gs);
@@ -75 +75 @@
     return true;
   }
-  
+
   bool GamestateManager::processGamestates(){
     std::map<int, packet::Gamestate*>::iterator it;
@@ -87 +87 @@
     return true;
   }
-  
-  
+
+
   bool GamestateManager::getSnapshot(){
     reference = new packet::Gamestate();
@@ -97 +97 @@
     return true;
   }
-  
+
   /**
    * this function is used to keep the memory usage low
    * it tries to delete all the unused gamestates
-   * 
-   * 
+   *
+   *
    */
 /*  void GamestateManager::cleanup(){
@@ -160 +160 @@
     return gs;
   }
-  
-  
+
+
   bool GamestateManager::ack(int gamestateID, int clientID) {
     ClientInformation *temp = ClientInformation::findClient(clientID);
     assert(temp);
     int curid = temp->getGamestateID();
-    
+
     if(gamestateID == 0){
       temp->setGamestateID(GAMESTATEID_INITIAL);
       return true;
     }
-    
+
     assert(curid<gamestateID);
     COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
@@ -194 +194 @@
     gamestateMap_.erase(clientMap);
   }
-  
+
   bool GamestateManager::processGamestate(packet::Gamestate *gs){
     if(gs->isCompressed())

code/branches/objecthierarchy/src/network/packet/Packet.cc

@@ -135 +135 @@
 Packet *Packet::createPacket(ENetPacket *packet, ENetPeer *peer){
   uint8_t *data = packet->data;
-  assert(ClientInformation::findClient(&peer->address)->getID()!=-2 || !Host::isServer());
+  assert(ClientInformation::findClient(&peer->address)->getID() != (unsigned int)-2 || !Host::isServer());
   unsigned int clientID = ClientInformation::findClient(&peer->address)->getID();
   Packet *p;

code/branches/objecthierarchy/src/orxonox/objects/Test.cc

@@ -46 +46 @@
         Test::~Test()
         {
-                
+
         }
 
@@ -67 +67 @@
           COUT(1) << "V1 changed: " << v1 << std::endl;
         }
-        
+
         void Test::checkV2(){
-          COUT(1) << "V2 changed: " << v1 << std::endl;
+          COUT(1) << "V2 changed: " << v2 << std::endl;
         }
-        
+
         void Test::checkV3(){
-          COUT(1) << "V3 changed: " << v1 << std::endl;
+          COUT(1) << "V3 changed: " << v3 << std::endl;
         }
-        
-        
+
+
 }

code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.cc

@@ -40 +40 @@
 
         this->registerVariables();
-
-        std::cout << "##### created pos-entity" << std::endl;
     }