Changeset 1299 for code/branches/merge/src/network/ClientInformation.cc

Timestamp:

May 15, 2008, 10:08:41 PM (16 years ago)

Author:

scheusso

Message:

a huge fix in packetbuffer

File:

• code/branches/merge/src/network/ClientInformation.cc (modified) (7 diffs)

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

@@ -121 +121 @@
 
   ClientInformation *ClientInformation::insertBefore(ClientInformation *ins){
+    if(!this)
+      return NULL;
     this->prev()->setNext(ins);
     ins->setPrev(this->preve);
@@ -132 +134 @@
   }
 
-  void ClientInformation::setPeer(ENetPeer *peer){
+  bool ClientInformation::setPeer(ENetPeer *peer){
+    if(!this)
+      return false;
     peer_ = peer;
-  }
-
-  void ClientInformation::setGamestateID(int id){
+    return true;
+  }
+
+  bool ClientInformation::setGamestateID(int id){
+    if(!this)
+      return false;
     gamestateID_=id;
+    return true;
   }
 
   int ClientInformation::getID() {
-    return clientID_;
+    if(!this)
+      return CLIENTID_UNKNOWN;
+    else
+      return clientID_;
   }
 
   ENetPeer *ClientInformation::getPeer() {
-    return peer_;
+    if(this)
+      return peer_;
+    else
+      return NULL;
   }
 
   int ClientInformation::getGamestateID() {
-    return gamestateID_;
+    if(this)
+      return gamestateID_;
+    else
+      return -1;
   }
 
   ClientInformation *ClientInformation::insertBack(ClientInformation *ins) {
+    if(!this)
+      return NULL;
     ClientInformation *temp = this;
     while(temp->next()!=0){
@@ -163 +182 @@
 
   bool ClientInformation::removeClient(int clientID) {
+    if(!this || clientID==CLIENTID_UNKNOWN)
+      return false;
     ClientInformation *temp = this;
     while(temp!=0 && temp->getID()!=clientID)
@@ -173 +194 @@
 
   bool ClientInformation::removeClient(ENetPeer *peer) {
+    if(!this || !peer)
+      return false;
     ClientInformation *temp = this;
     while(temp!=0){
@@ -196 +219 @@
     if (temp->head)
       temp=temp->next();
-    //bugfix: temp to temp->next(), get last elem if not found, not segflt
-    while(temp->next()!=0 && temp->getID()!=clientID){
+    while(temp!=0 && temp->getID()!=clientID){
       temp = temp->next();
     }
@@ -212 +234 @@
   ClientInformation *ClientInformation::findClient(ENetAddress *address, bool look_backwards) {
     ClientInformation *temp = this;
-    //bugfix: temp to temp->next(), get last elem if not found, not segflt
-    while(temp->next()!=0){
+    while(temp!=0){
       if(temp->head){
         temp = temp->next();
@@ -226 +247 @@
   }
 
-  void ClientInformation::setSynched(bool s) {
+  bool ClientInformation::setSynched(bool s) {
+    if(!this)
+      return false;
     synched_=s;
+    return true;
   }
 
   bool ClientInformation::getSynched() {
-    return synched_;
+    if(this)
+      return synched_;
+    else
+      return false;
   }