Changeset 4833 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Jul 11, 2005, 5:46:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fight against the mighty segfault

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (5 diffs)
• weapon_manager.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/weapons/weapon_manager.cc

@@ -32 +32 @@
 WeaponManager::WeaponManager(int nrOfSlots)
 {
-  this->setClassID(CL_WEAPON_MANAGER, "WeaponManager");
-
-  for(int i = 0; i < W_MAX_CONFIGS; ++i)
-  {
-    this->configs[i].bUsed = false;
-    for(int j = 0; j < W_MAX_SLOTS; ++j)
-      this->configs[i].slots[j] = NULL;
-  }
+  this->init();
   this->nrOfSlots = nrOfSlots;
-  this->currConfID = W_CONFIG0;
-}
-
-
+}
+
+
+/**
+ * Destroys a WeaponManager
+ */
 WeaponManager::~WeaponManager()
 {
@@ -60 +55 @@
 }
 
+void WeaponManager::init()
+{
+  this->setClassID(CL_WEAPON_MANAGER, "WeaponManager");
+
+  for(int i = 0; i < W_MAX_CONFIGS; ++i)
+  {
+    this->configs[i].bUsed = false;
+    for(int j = 0; j < W_MAX_SLOTS; ++j)
+      this->configs[i].slots[j] = NULL;
+  }
+  this->currConfID = W_CONFIG0;
+
+}
 
 /**
@@ -162 +170 @@
  * @param second passed since last tick
  */
-void WeaponManager::tick(float sec)
+void WeaponManager::tick(float dt)
 {
   Weapon* w;
@@ -168 +176 @@
   {
     w = this->configs[this->currConfID].slots[i];
-    if( w != NULL) w->tick(sec);
+    if( w != NULL) w->tick(dt);
   }
 }
@@ -182 +190 @@
   {
     w = this->configs[this->currConfID].slots[i];
-    if( w != NULL) w->draw();
+    if( w != NULL)
+      w->draw();
   }
 }

orxonox/trunk/src/world_entities/weapons/weapon_manager.h

@@ -56 +56 @@
 
 //! this is a weapon Configuration: it has up to 8 slots
-typedef struct weaponConfig {
+typedef struct weaponConfig
+{
   bool           bUsed;                       //!< is set to true, if this configuration is
   Weapon*        slots[8];
@@ -76 +77 @@
 
     void fire();
-    void tick(float sec);
+    void tick(float dt);
     void draw();