Changeset 6414 in orxonox.OLD for branches

Timestamp:

Jan 6, 2006, 2:47:36 PM (19 years ago)

Author:

rennerc

Message:

 

Location:

branches/network/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• world_entities/power_ups/param_power_up.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)

branches/network/src/lib/network/network_game_manager.cc

@@ -23 +23 @@
 #include "network_stream.h"
 #include "converter.h"
+#include "p_node.h"
 
 /* include your own header */
@@ -699 +700 @@
 
   }
+  PNode::getNullParent()->debugNode( 0 );
   return true;
 }

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

@@ -64 +64 @@
   static_cast<PowerUp*>(this)->loadParams(root);
   LoadParam(root, "type", this, ParamPowerUp, setType);
-  if(root->FirstChildElement("value") != NULL) {
+  if(root!=NULL && root->FirstChildElement("value") != NULL) {
     LoadParam(root, "value", this, ParamPowerUp, setValue);
   }

branches/network/src/world_entities/terrain.cc

@@ -327 +327 @@
   SYNCHELP_READ_FKT( WorldEntity::writeState );
 
+  PNode::getNullParent()->debugNode( 0 );
+
   return SYNCHELP_READ_N;
 }