Changeset 9281 in orxonox.OLD

Timestamp:

Jul 13, 2006, 11:21:21 PM (18 years ago)

Author:

patrick

Message:

segfault fix

Location:

branches/proxy/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/network/monitor/network_monitor.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (2 diffs)

branches/proxy/src/defs/class_id.h

@@ -422 +422 @@
   CL_PLAYER_STATS               =    0x00000d09,
   CL_SIMPLE_SYNC                =    0x00000d0a,
+  CL_NETWORK_MONITOR            =    0x00000d0b,
 
 

branches/proxy/src/lib/network/monitor/network_monitor.cc

@@ -34 +34 @@
  */
 NetworkMonitor::NetworkMonitor(NetworkStream* networkStream)
+  : Synchronizeable()
 {
+  this->setClassID(CL_NETWORK_MONITOR, "NetworkMonitor");
+
   this->networkStream = networkStream;
   this->playerNumber = 0;
+  this->setSynchronized(false);
 }
 

branches/proxy/src/lib/network/network_stream.cc

@@ -105 +105 @@
   this->serverSocket = NULL;
   this->networkGameManager = NULL;
-  this->networkMonitor = new NetworkMonitor(this);
+  this->networkMonitor = NULL;
 
   this->myHostId = 0;
@@ -222 +222 @@
 void NetworkStream::processData()
 {
+  // create the network monitor after all the init work and before there is any connection handlings
+  if( this->networkMonitor == NULL)
+    this->networkMonitor = new NetworkMonitor(this);
+
+
   int tick = SDL_GetTicks();