Changeset 10676 in orxonox.OLD for branches/vs-enhencements/src/world_entities/weapons/weapon_slot.cc

Timestamp:

Jun 7, 2007, 5:10:52 PM (17 years ago)

Author:

nicolasc

Message:

xfer

File:

• branches/vs-enhencements/src/world_entities/weapons/weapon_slot.cc (modified) (3 diffs)

branches/vs-enhencements/src/world_entities/weapons/weapon_slot.cc

@@ -12 +12 @@
 ### File Specific
    main-programmer: Patrick Boenzli
-
+   co-programmer: Nicolas Schlumberger
 */
 
@@ -30 +30 @@
 {
   this->registerObject(this, WeaponSlot::_objectList);
+
+  for (int i = 0; i < WM_MAX_CONFIGS; i++)
+    this->configs[i] = NULL;
 }
 
@@ -58 +61 @@
   .describe("sets the weapon slot");
 
-  LoadParam(root, "currentWeapon", this, WeaponSlot, setCurrentWeapon)
-  .describe("creates and set next weapon");
+//   LoadParam(root, "currentWeapon", this, WeaponSlot, setCurrentWeapon)
+//   .describe("creates and set next weapon");
+// 
+//   LoadParam(root, "nextWeapon", this, WeaponSlot, setNextWeapon)
+//   .describe("creates and set next weapon");
 
-  LoadParam(root, "nextWeapon", this, WeaponSlot, setNextWeapon)
-  .describe("creates and set next weapon");
+  LoadParam(root, "addWeapon", this, WeaponSlot, addWeapon)
+  .describe("create a new Weapon, and add it to config");
 }