Changeset 1955 for code/branches/objecthierarchy

Timestamp:

Oct 19, 2008, 10:12:50 PM (16 years ago)

Author:

scheusso

Message:

ClientInformation is now consisten with other classes regarding clientid
and gamestateid

Location:

code/branches/objecthierarchy/src/network

Files:

• ClientInformation.cc (modified) (5 diffs)
• ClientInformation.h (modified) (3 diffs)

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

@@ -137 +137 @@
   }
 
-  int ClientInformation::getID() {
+  unsigned int ClientInformation::getID() {
     if(!this)
       return CLIENTID_UNKNOWN;
@@ -169 +169 @@
   }
 
-  int ClientInformation::getGamestateID() {
+  unsigned int ClientInformation::getGamestateID() {
     if(this)
       return gamestateID_;
@@ -176 +176 @@
   }
 
-  int ClientInformation::getPartialGamestateID() {
+  unsigned int ClientInformation::getPartialGamestateID() {
     if(this)
       return partialGamestateID_;
@@ -196 +196 @@
   }
 
-  bool ClientInformation::removeClient(int clientID) {
+  bool ClientInformation::removeClient(unsigned int clientID) {
     if((unsigned int)clientID==CLIENTID_UNKNOWN)
       return false;
@@ -229 +229 @@
   * @return pointer to the last element in the list or 0 if the search was unsuccessfull
   */
-  ClientInformation *ClientInformation::findClient(int clientID, bool look_backwards) {
+  ClientInformation *ClientInformation::findClient(unsigned int clientID, bool look_backwards) {
     ClientInformation *temp = head_;
     while(temp!=0 && temp->getID()!=clientID){

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

@@ -77 +77 @@
     // get functions
     inline unsigned int getShipID(){return ShipID_;}
-    int getID();
-    int getGamestateID();
-    int getPartialGamestateID();
+    unsigned int getID();
+    unsigned int getGamestateID();
+    unsigned int getPartialGamestateID();
     ENetPeer *getPeer();
 
@@ -88 +88 @@
     enet_uint32 getPacketLoss();
 
-    static bool removeClient(int clientID);
+    static bool removeClient(unsigned int clientID);
     static bool removeClient(ENetPeer *peer);
-    static ClientInformation *findClient(int clientID, bool look_backwards=false);
+    static ClientInformation *findClient(unsigned int clientID, bool look_backwards=false);
     static ClientInformation *findClient(ENetAddress *address, bool look_backwards=false);
     static ClientInformation *getBegin(){return head_;}
@@ -110 +110 @@
     //actual information:
     ENetPeer *peer_;
-    int clientID_;
-    int gamestateID_;
-    int partialGamestateID_;
+    unsigned int clientID_;
+    unsigned int gamestateID_;
+    unsigned int partialGamestateID_;
     unsigned int ShipID_;   // this is the unique objectID
     bool synched_;