Changeset 1758

Timestamp:

Sep 10, 2008, 11:09:43 AM (16 years ago)

Author:

scheusso

Message:

cant remember

Location:

code/trunk/src

Files:

• network/GamestateClient.cc (modified) (1 diff)
• network/Synchronisable.cc (modified) (1 diff)
• network/packet/Packet.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)
• tolua/toluabind_orxonox.c (deleted)
• tolua/toluabind_orxonox.h (deleted)

code/trunk/src/network/GamestateClient.cc

@@ -131 +131 @@
 
   bool GamestateClient::saveShipCache(){
-    if(myShip_==NULL)
+    if(myShip_==NULL){
       myShip_ = orxonox::SpaceShip::getLocalShip();
+      if(!myShip_)
+        return false;
+    }
     if(myShip_){
       //      unsigned char *data = new unsigned char[myShip_->getSize()];

code/trunk/src/network/Synchronisable.cc

@@ -98 +98 @@
     classID = *(unsigned int*)(mem+2*sizeof(unsigned int));
     
-    if(size==3*sizeof(unsigned int)) //not our turn, dont do anything
+    if(size==3*sizeof(unsigned int)){ //not our turn, dont do anything
+      mem+=3*sizeof(unsigned int);
       return true;
+    }
     
     orxonox::Identifier* id = GetIdentifier(classID);

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

@@ -30 +30 @@
 #include <enet/enet.h>
 #include <boost/bind.hpp>
+#include <assert.h>
 
 #include "Packet.h"

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -76 +76 @@
       ObjectList<SpaceShip>::iterator it;
       for(it = ObjectList<SpaceShip>::begin(); it; ++it){
-        if( (it)->myShip_ )
+        assert(it->isA(Class(SpaceShip)));
+        if( (it)->myShip_ || (network::Host::running() && network::Host::getShipID()==(it)->objectID) )
           return *it;
       }
-      assert(0);
+      return 0;
       return 0;
     }