Changeset 6695 in orxonox.OLD for trunk/src/world_entities/power_ups

Timestamp:

Jan 25, 2006, 2:39:53 PM (19 years ago)

Author:

patrick

Message:

merged the network branche to the trunk

Location:

trunk/src/world_entities/power_ups

Files:

• param_power_up.cc (modified) (1 diff)
• turret_power_up.cc (modified) (1 diff)
• weapon_power_up.cc (modified) (1 diff)

trunk/src/world_entities/power_ups/param_power_up.cc

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

trunk/src/world_entities/power_ups/turret_power_up.cc

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

trunk/src/world_entities/power_ups/weapon_power_up.cc

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