Changeset 4832 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon.h

Timestamp:

Jul 11, 2005, 5:45:27 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: loadParams and timing

File:

• orxonox/trunk/src/world_entities/weapons/weapon.h (modified) (3 diffs)

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

@@ -22 +22 @@
 #include "world_entity.h"
 
-#define W_MAX_SLOTS 8
-#define W_MAX_CONFIGS 4
-
-
 // FORWARD DECLARATION
 class Projectile;
@@ -42 +38 @@
   WA_SPECIAL1      =    6,    //!< Special Action taken
 
-  WA_ACTION_COUNT  =    6     //!< This must match the count of enumerations (without W_NONE)
+  WA_ACTION_COUNT  =    7     //!< This must match the count of enumerations-members.
 } WeaponActions;
 
@@ -55 +51 @@
   WS_IDLE          =    7,    //!< The State where the weapon is idle
 
-  WS_STATE_COUNT  =    7     //!< This must match the count of the enumerations (without W_NONE)
+  WS_STATE_COUNT  =     8      //!< This must match the count of the enumerations-members.
 } WeaponState;