Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1758 for code/trunk


Ignore:
Timestamp:
Sep 10, 2008, 11:09:43 AM (16 years ago)
Author:
scheusso
Message:

cant remember ;)

Location:
code/trunk/src
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/network/GamestateClient.cc

    r1751 r1758  
    131131
    132132  bool GamestateClient::saveShipCache(){
    133     if(myShip_==NULL)
     133    if(myShip_==NULL){
    134134      myShip_ = orxonox::SpaceShip::getLocalShip();
     135      if(!myShip_)
     136        return false;
     137    }
    135138    if(myShip_){
    136139      //      unsigned char *data = new unsigned char[myShip_->getSize()];
  • code/trunk/src/network/Synchronisable.cc

    r1755 r1758  
    9898    classID = *(unsigned int*)(mem+2*sizeof(unsigned int));
    9999   
    100     if(size==3*sizeof(unsigned int)) //not our turn, dont do anything
     100    if(size==3*sizeof(unsigned int)){ //not our turn, dont do anything
     101      mem+=3*sizeof(unsigned int);
    101102      return true;
     103    }
    102104   
    103105    orxonox::Identifier* id = GetIdentifier(classID);
  • code/trunk/src/network/packet/Packet.cc

    r1751 r1758  
    3030#include <enet/enet.h>
    3131#include <boost/bind.hpp>
     32#include <assert.h>
    3233
    3334#include "Packet.h"
  • code/trunk/src/orxonox/objects/SpaceShip.cc

    r1755 r1758  
    7676      ObjectList<SpaceShip>::iterator it;
    7777      for(it = ObjectList<SpaceShip>::begin(); it; ++it){
    78         if( (it)->myShip_ )
     78        assert(it->isA(Class(SpaceShip)));
     79        if( (it)->myShip_ || (network::Host::running() && network::Host::getShipID()==(it)->objectID) )
    7980          return *it;
    8081      }
    81       assert(0);
     82      return 0;
    8283      return 0;
    8384    }
Note: See TracChangeset for help on using the changeset viewer.