Changeset 6675 in orxonox.OLD

Timestamp:

Jan 24, 2006, 4:39:51 PM (18 years ago)

Author:

patrick

Message:

network: the net code works again

Location:

branches/network/src

Files:

• lib/network/synchronizeable.cc (modified) (1 diff)
• world_entities/movie_entity.cc (modified) (1 diff)
• world_entities/power_ups/param_power_up.cc (modified) (1 diff)
• world_entities/power_ups/turret_power_up.cc (modified) (1 diff)
• world_entities/power_ups/weapon_power_up.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/weapons/targeting_turret.cc (modified) (1 diff)

branches/network/src/lib/network/synchronizeable.cc

@@ -19 +19 @@
 #include "synchronizeable.h"
 
+#include "network_manager.h"
+#include "network_stream.h"
 #include "netdefs.h"
-#include "network_manager.h"
-#include "network_game_manager.h"
-#include "network_stream.h"
 
 #include "assert.h"

branches/network/src/world_entities/movie_entity.cc

@@ -43 +43 @@
   this->toList(OM_COMMON);
 
-  this->loadParams(root);
+  if( root != NULL)
+    this->loadParams(root);
 
   counter = 0;

branches/network/src/world_entities/power_ups/param_power_up.cc

@@ -46 +46 @@
 {
   this->init();
-  this->loadParams(root);
+  if( root != NULL)
+    this->loadParams(root);
 }
 

branches/network/src/world_entities/power_ups/turret_power_up.cc

@@ -36 +36 @@
   this->init();
 
-  this->loadParams(root);
+  if( root != NULL)
+    this->loadParams(root);
 }
 

branches/network/src/world_entities/power_ups/weapon_power_up.cc

@@ -39 +39 @@
 {
   this->init();
-  this->loadParams(root);
+  if( root != NULL)
+    this->loadParams(root);
 }
 

branches/network/src/world_entities/skybox.cc

@@ -51 +51 @@
   this->preInit();
 
-  this->loadParams(root);
+  if( root != NULL)
+    this->loadParams(root);
 
   this->postInit();

branches/network/src/world_entities/terrain.cc

@@ -39 +39 @@
 {
   this->init();
-  this->loadParams(root);
+  if( root != NULL)
+    this->loadParams(root);
 
 //  if (this->model != NULL)

branches/network/src/world_entities/weapons/targeting_turret.cc

@@ -48 +48 @@
 {
   this->init();
-  this->loadParams(root);
+  if( root != NULL)
+    this->loadParams(root);
 }