Changeset 4906 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon_manager.h

Timestamp:

Jul 20, 2005, 1:41:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: states are now flow'n through

File:

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

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

@@ -39 +39 @@
 
 //! this is an identifier for the weapon config
-#define    W_CONFIG0     0
-#define    W_CONFIG1     1
-#define    W_CONFIG2     2
-#define    W_CONFIG3     3
+typedef enum
+{
+  WM_CONFIG0           = 0,
+  WM_CONFIG1           = 1,
+  WM_CONFIG2           = 2,
+  WM_CONFIG3           = 3,
 
+  WM_CONFIGCOUNT       = 4
+} WM_CONFIG;
 
 //! this is an identifier for the slot. there are up to 8 weapon slots -> this means there can't be more than 8 weapons at the same time
-#define    W_SLOT0       0
-#define    W_SLOT1       1
-#define    W_SLOT2       2
-#define    W_SLOT3       3
-#define    W_SLOT4       4
-#define    W_SLOT5       5
-#define    W_SLOT6       6
-#define    W_SLOT7       7
-#define    W_FREE_SLOT   99
+typedef enum
+{
+  WM_SLOT0              = 0,
+  WM_SLOT1              = 1,
+  WM_SLOT2              = 2,
+  WM_SLOT3              = 3,
+  WM_SLOT4              = 4,
+  WM_SLOT5              = 5,
+  WM_SLOT6              = 6,
+  WM_SLOT7              = 7,
 
+  WM_SLOT_COUNT         = 8,
+
+  WM_FREE_SLOT          = -1
+} WM_SLOT;
 
 //! this is a weapon Configuration: it has up to 8 slots
@@ -77 +86 @@
     void setSlotCount(int nrOfSlots);
 
-    void addWeapon(Weapon* weapon, int configID = W_CONFIG0, int slotID = W_FREE_SLOT);
-    void removeWeapon(Weapon* weapon, int configID = W_CONFIG0);
+    void addWeapon(Weapon* weapon, int configID = WM_CONFIG0, int slotID = WM_FREE_SLOT);
+    void removeWeapon(Weapon* weapon, int configID = WM_CONFIG0);
     void nextWeaponConf();