Changeset 4895 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon_manager.cc

Timestamp:

Jul 19, 2005, 6:27:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: messed things up a bit, try fixing

File:

• orxonox/trunk/src/world_entities/weapons/weapon_manager.cc (modified) (2 diffs)

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

@@ -76 +76 @@
   }
   this->currConfID = W_CONFIG0;
+
+
+
+
   this->crosshair = new Crosshair();
 
@@ -237 +241 @@
 {
   Weapon* w;
+  for (int j = 0; j < 4; ++j )
+    for(int i = 0; i < W_MAX_SLOTS; ++i)
+  {
+    w = this->configs[j].slots[i];
+    if( w != NULL) w->tick(dt);
+  }
+
+  crosshair->setRotationSpeed(5);
+}
+
+
+/**
+ * triggers draw of all weapons in the current weaponconfig
+ */
+void WeaponManager::draw()
+{
+  Weapon* w;
+  for (int j = 0; j < 4; ++j )
   for(int i = 0; i < W_MAX_SLOTS; ++i)
   {
-    w = this->configs[this->currConfID].slots[i];
-    if( w != NULL) w->tick(dt);
-  }
-
-  crosshair->setRotationSpeed(5);
-}
-
-
-/**
- * triggers draw of all weapons in the current weaponconfig
- */
-void WeaponManager::draw()
-{
-  Weapon* w;
-  for(int i = 0; i < W_MAX_SLOTS; ++i)
-  {
-    w = this->configs[this->currConfID].slots[i];
+    w = this->configs[j].slots[i];
     if( w != NULL)
       w->draw();