Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2833


Ignore:
Timestamp:
Mar 23, 2009, 4:15:33 PM (15 years ago)
Author:
scheusso
Message:

some bugfixes (client crashed when server was killed 2 times)

Location:
code/branches/netp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/netp/src/network/synchronisable/NetworkCallbackManager.cc

    r2662 r2833  
    3232
    3333namespace orxonox{
    34 
     34 
    3535  std::set<NetworkCallbackBase*> NetworkCallbackManager::callbackSet_;
    3636  std::queue<NetworkCallbackBase*> NetworkCallbackManager::triggeredCallbacks_;
     
    6060    while( triggeredCallbacks_.empty()==false )
    6161    {
    62       triggeredCallbacks_.front()->call();
     62      //make sure callback hasn't been deleted before
     63      if ( callbackSet_.find(triggeredCallbacks_.front()) != callbackSet_.end() )
     64        triggeredCallbacks_.front()->call();
    6365      triggeredCallbacks_.pop();
    6466    }
  • code/branches/netp/src/orxonox/objects/worldentities/pawns/Pawn.cc

    r2782 r2833  
    129129        this->firehack_ = 0x0;
    130130
    131         if (this->health_ <= 0)
     131        if (Core::isMaster())
     132          if (this->health_ <= 0)
    132133            this->death();
    133134    }
Note: See TracChangeset for help on using the changeset viewer.