Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9281 in orxonox.OLD for branches/proxy


Ignore:
Timestamp:
Jul 13, 2006, 11:21:21 PM (18 years ago)
Author:
patrick
Message:

segfault fix

Location:
branches/proxy/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/defs/class_id.h

    r9235 r9281  
    422422  CL_PLAYER_STATS               =    0x00000d09,
    423423  CL_SIMPLE_SYNC                =    0x00000d0a,
     424  CL_NETWORK_MONITOR            =    0x00000d0b,
    424425
    425426
  • branches/proxy/src/lib/network/monitor/network_monitor.cc

    r9280 r9281  
    3434 */
    3535NetworkMonitor::NetworkMonitor(NetworkStream* networkStream)
     36  : Synchronizeable()
    3637{
     38  this->setClassID(CL_NETWORK_MONITOR, "NetworkMonitor");
     39
    3740  this->networkStream = networkStream;
    3841  this->playerNumber = 0;
     42  this->setSynchronized(false);
    3943}
    4044
  • branches/proxy/src/lib/network/network_stream.cc

    r9280 r9281  
    105105  this->serverSocket = NULL;
    106106  this->networkGameManager = NULL;
    107   this->networkMonitor = new NetworkMonitor(this);
     107  this->networkMonitor = NULL;
    108108
    109109  this->myHostId = 0;
     
    222222void NetworkStream::processData()
    223223{
     224  // create the network monitor after all the init work and before there is any connection handlings
     225  if( this->networkMonitor == NULL)
     226    this->networkMonitor = new NetworkMonitor(this);
     227
     228
    224229  int tick = SDL_GetTicks();
    225230
Note: See TracChangeset for help on using the changeset viewer.