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

Timestamp:

Jan 8, 2006, 5:19:39 PM (18 years ago)

Author:

bensch

Message:

Gui Shows weapons (simple)

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (2 diffs)
• playable.h (modified) (2 diffs)
• player.cc (modified) (2 diffs)
• weapons/weapon_manager.h (modified) (2 diffs)

trunk/src/world_entities/playable.cc

@@ -25 +25 @@
 Playable::Playable()
 {
-  this->init();
+  this->setClassID(CL_PLAYABLE, "Playable");
+  PRINTF(4)("PLAYABLE INIT\n");
+
+  this->toList(OM_GROUP_01);
+  this->weaponMan = new WeaponManager(this);
+
+  // the reference to the Current Player is NULL, because we dont have one at the beginning.
+  this->currentPlayer = NULL;
 }
 
@@ -39 +46 @@
 }
 
-/**
- * initializes this Playable
- */
-void Playable::init()
-{
-  this->setClassID(CL_PLAYABLE, "Playable");
-  PRINTF(4)("PLAYABLE INIT\n");
-
-  this->toList(OM_GROUP_01);
-  this->weaponMan = new WeaponManager(this);
-
-  // the reference to the Current Player is NULL, because we dont have one at the beginning.
-  this->currentPlayer = NULL;
-}
 
 /**

trunk/src/world_entities/playable.h

@@ -10 +10 @@
 #include "event.h"
 #include <list>
+
 
 class Weapon;
@@ -51 +52 @@
 
   private:
-    void init();
-
-  private:
     WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
     std::list<int>        events;             //!< A list of Events, that are captured for this playable

trunk/src/world_entities/player.cc

@@ -59 +59 @@
       this->controllable = controllable;
       this->hud.setEnergyWidget(this->controllable->getEnergyWidget());
+      this->hud.setWeaponManager(this->controllable->getWeaponManager());
       return true;
   }
@@ -73 +74 @@
      this->controllable = NULL;
      this->hud.setEnergyWidget(NULL);
+     this->hud.setWeaponManager(NULL);
      return true;
    }

trunk/src/world_entities/weapons/weapon_manager.h

@@ -54 +54 @@
 
     void setSlotCount(unsigned int slotCount);
+    unsigned int getSlotCount() const { return this->slotCount; };
     // setting up the WeaponManager with the following functions
     void setSlotPosition(int slot, const Vector& position);
@@ -69 +70 @@
     void 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].currentWeapon: NULL; };
 
     // FIXME ::