Changeset 6561 in orxonox.OLD

Timestamp:

Jan 18, 2006, 3:00:56 PM (18 years ago)

Author:

bensch

Message:

trunk: WeaponManager update

Location:

trunk/src/world_entities

Files:

• creatures/md2_creature.cc (modified) (1 diff)
• creatures/md2_creature.h (modified) (1 diff)
• weapons/turret.cc (modified) (2 diffs)
• weapons/weapon_manager.cc (modified) (5 diffs)
• weapons/weapon_manager.h (modified) (1 diff)

trunk/src/world_entities/creatures/md2_creature.cc

@@ -208 +208 @@
 }
 
-
-/**
- * adds a weapon to the weapon list of the MD2Creature
- * @param weapon to add
-*/
-void MD2Creature::addWeapon(Weapon* weapon)
-{
-  this->getWeaponManager()->addWeapon(weapon);
-}
-
-
-/**
- *  removes a weapon from the MD2Creature
- * @param weapon to remove
-*/
-void MD2Creature::removeWeapon(Weapon* weapon)
-{
-  this->getWeaponManager()->removeWeapon(weapon);
-}
 
 /**

trunk/src/world_entities/creatures/md2_creature.h

@@ -29 +29 @@
     virtual void enter();
     virtual void leave();
-
-    void addWeapon(Weapon* weapon );
-    void removeWeapon(Weapon* weapon);
 
     virtual void postSpawn();

trunk/src/world_entities/weapons/turret.cc

@@ -94 +94 @@
   this->setProjectileType(CL_ROCKET);
 
+  this->loadModel("models/guns/turret1.obj");
 
   this->setEmissionPoint(1.684, 0.472, 0);
@@ -102 +103 @@
 {
   Weapon::loadParams(root);
-
 }
 

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -22 +22 @@
 #include "weapon.h"
 #include "crosshair.h"
+
+#include "playable.h"
 
 #include "load_param.h"
@@ -213 +215 @@
  * a error message.
  */
-void WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID)
+bool WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID)
 {
   if (unlikely(configID >= WM_MAX_CONFIGS || slotID >= (int)this->slotCount))
   {
     PRINTF(2)("Slot %d of config %d is not availiabe (max: %d)\n", slotID, configID, this->slotCount);
-    return;
+    return false;
   }
 
@@ -230 +232 @@
     {
       PRINTF(1)("There is no free slot in this WeaponConfig to dock this weapon at! Aborting\n");
-      return;
+      return false;
     }
   }
@@ -239 +241 @@
     PRINTF(2)("Unable to add Weapon with wrong capatibility to Slot %d (W:%d M:%d)\n",
               slotID, weapon->getCapability(), this->currentSlotConfig[slotID].capability);
-    return;
+    return false;
   }
 
@@ -249 +251 @@
   }
   PRINTF(3)("Added a new Weapon to the WeaponManager: config %i/ slot %i\n", configID, slotID);
+  return true;
 }
 

trunk/src/world_entities/weapons/weapon_manager.h

@@ -71 +71 @@
     PNode* getParent() const { return this->parent; };
 
-    void addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
+    bool addWeapon(Weapon* weapon);
+    bool addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);
     Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].nextWeapon: NULL; };