summaryrefslogtreecommitdiffstats
path: root/src/object/motion/motionhuman.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-06-11 17:28:27 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-06-11 17:28:27 +0200
commita8665d204255b4b0ad9ae6982f77ecd5e053c1b6 (patch)
tree5f7e58785f5175e7f067ffaf8f96d16272c92d1e /src/object/motion/motionhuman.h
parent8ffdf2583e4ea77731490dcaad51dbc08d7f26fa (diff)
downloadcolobot-a8665d204255b4b0ad9ae6982f77ecd5e053c1b6.tar.gz
colobot-a8665d204255b4b0ad9ae6982f77ecd5e053c1b6.tar.bz2
colobot-a8665d204255b4b0ad9ae6982f77ecd5e053c1b6.zip
Changed #defined constants to consts; typedef struct -> struct
Diffstat (limited to 'src/object/motion/motionhuman.h')
-rw-r--r--src/object/motion/motionhuman.h54
1 files changed, 30 insertions, 24 deletions
diff --git a/src/object/motion/motionhuman.h b/src/object/motion/motionhuman.h
index e563a81..1fc8d57 100644
--- a/src/object/motion/motionhuman.h
+++ b/src/object/motion/motionhuman.h
@@ -34,30 +34,36 @@ class CPhysics;
class CObject;
-#define MH_MARCH 0
-#define MH_MARCHTAKE 1
-#define MH_TURN 2
-#define MH_STOP 3
-#define MH_FLY 4
-#define MH_SWIM 5
-#define MH_SPEC 6
-
-#define MHS_FIRE 0
-#define MHS_GUN 1
-#define MHS_TAKE 2
-#define MHS_TAKEOTHER 3
-#define MHS_TAKEHIGH 4
-#define MHS_UPRIGHT 5
-#define MHS_WIN 6
-#define MHS_LOST 7
-#define MHS_DEADg 8
-#define MHS_DEADg1 9
-#define MHS_DEADg2 10
-#define MHS_DEADg3 11
-#define MHS_DEADg4 12
-#define MHS_DEADw 13
-#define MHS_FLAG 14
-#define MHS_SATCOM 15
+enum MotionHumanAction
+{
+ MH_MARCH = 0,
+ MH_MARCHTAKE = 1,
+ MH_TURN = 2,
+ MH_STOP = 3,
+ MH_FLY = 4,
+ MH_SWIM = 5,
+ MH_SPEC = 6
+};
+
+enum MotionHumanSpecialAction
+{
+ MHS_FIRE = 0,
+ MHS_GUN = 1,
+ MHS_TAKE = 2,
+ MHS_TAKEOTHER = 3,
+ MHS_TAKEHIGH = 4,
+ MHS_UPRIGHT = 5,
+ MHS_WIN = 6,
+ MHS_LOST = 7,
+ MHS_DEADg = 8,
+ MHS_DEADg1 = 9,
+ MHS_DEADg2 = 10,
+ MHS_DEADg3 = 11,
+ MHS_DEADg4 = 12,
+ MHS_DEADw = 13,
+ MHS_FLAG = 14,
+ MHS_SATCOM = 15
+};
class CMotionHuman : public CMotion