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

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/weapons

Files:

• targeting_turret.cc (modified) (1 diff)
• weapon.cc (modified) (1 diff)

trunk/src/world_entities/weapons/targeting_turret.cc

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

trunk/src/world_entities/weapons/weapon.cc

@@ -100 +100 @@
 
   this->energyWidget = NULL;
+
+  // set this object to be synchronized over network
+  //this->setSynchronized(true);
 }