Changeset 1021 for code/trunk/src/orxonox/objects/weapon

Timestamp:

Apr 10, 2008, 5:03:34 PM (16 years ago)

Author:

bknecht

Message:

merged back that script-branch

Location:

code/trunk/src/orxonox/objects/weapon

Files:

• AmmunitionDump.cc (modified) (2 diffs)
• AmmunitionDump.h (modified) (1 diff)
• BulletManager.cc (modified) (2 diffs)
• BulletManager.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc

@@ -45 +45 @@
   {
     RegisterObject(AmmunitionDump);
+    registerAllVariables();
 
     for (int i = 0; i < numberOfAmmos_; i++)
@@ -114 +115 @@
     return stock_[id];
   }
+  
+  void AmmunitionDump::registerAllVariables(){
+    registerVar( &numberOfAmmos_, sizeof(int), network::DATA);
+    
+    for (int i = 0; i < numberOfAmmos_; i++)
+    {
+      registerVar(&stock_[i], sizeof(int), network::DATA);
+      registerVar(&capacity_[i], sizeof(int), network::DATA);
+    }
+  }
 }

code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -60 +60 @@
   protected:
     inline bool create() { return true; }
+    void registerAllVariables();
 
     int numberOfAmmos_;

code/trunk/src/orxonox/objects/weapon/BulletManager.cc

@@ -39 +39 @@
   {
     RegisterObject(BulletManager);
+    registerAllVariables();
     bullets_ = new Bullet*[bulletsSize_];
   }
@@ -103 +104 @@
   }
 
+  void BulletManager::registerAllVariables(){
+    registerVar(&bulletsSize_, sizeof(int), network::DATA);
+    registerVar(&bulletsIndex_, sizeof(int), network::DATA);
+    // TODO we got a problem here:
+    // there is no possibility (so far) to synchronise pointers to objects
+  }
+  
 }

code/trunk/src/orxonox/objects/weapon/BulletManager.h

@@ -39 +39 @@
 #include "util/tinyxml/tinyxml.h"
 #include "core/BaseObject.h"
-#include "../Tickable.h"
+#include "core/Tickable.h"
 
 namespace orxonox {
@@ -60 +60 @@
   protected:
     inline bool create() { return true; }
+    void registerAllVariables();
 
     // Bullet array