summaryrefslogtreecommitdiff
path: root/common.h
diff options
context:
space:
mode:
authorPetr Mrázek2012-01-27 05:52:06 +0100
committerPetr Mrázek2012-01-27 05:52:06 +0100
commit66115070844f3bc1ae3f9142e43f7c110aa18159 (patch)
tree661a3c27bcdc105ea890e117dfb1f3790e5a0c0c /common.h
parent92627e39cb3502812cd5a131716d3d1da8ef625a (diff)
downloadstonesense-66115070844f3bc1ae3f9142e43f7c110aa18159.tar.gz
stonesense-66115070844f3bc1ae3f9142e43f7c110aa18159.tar.bz2
stonesense-66115070844f3bc1ae3f9142e43f7c110aa18159.tar.xz
Major stonesense fixage.
Diffstat (limited to 'common.h')
-rw-r--r--common.h64
1 files changed, 34 insertions, 30 deletions
diff --git a/common.h b/common.h
index c2dbad8..24b369d 100644
--- a/common.h
+++ b/common.h
@@ -216,36 +216,40 @@ extern ALLEGRO_TIMER *reloadtimer;
extern ALLEGRO_TIMER * animationtimer;
extern ALLEGRO_MOUSE_STATE mouse;
-#define INORGANIC 0
-#define AMBER 1
-#define CORAL 2
-#define GREEN_GLASS 3
-#define CLEAR_GLASS 4
-#define CRYSTAL_GLASS 5
-#define ICE 6
-#define COAL 7
-#define POTASH 8
-#define ASH 9
-#define PEARLASH 10
-#define LYE 11
-#define MUD 12
-#define VOMIT 13
-#define SALT 14
-#define FILTH 15
-#define FILTH_FROZEN 16
-#define UNKOWN_FROZEN 17
-#define GRIME 18
-#define ICHOR 20
-#define LEATHER 37
-#define BLOOD_1 39
-#define BLOOD_2 40
-#define BLOOD_3 41
-#define BLOOD_4 42
-#define BLOOD_5 43
-#define BLOOD_6 44
-#define BLOOD_NAMED 242
-#define WOOD 420
-#define PLANTCLOTH 421
+enum MAT_BASICS
+{
+ INVALID = -1,
+ INORGANIC = 0,
+ AMBER = 1,
+ CORAL = 2,
+ GREEN_GLASS = 3,
+ CLEAR_GLASS = 4,
+ CRYSTAL_GLASS = 5,
+ ICE = 6,
+ COAL = 7,
+ POTASH = 8,
+ ASH = 9,
+ PEARLASH = 10,
+ LYE = 11,
+ MUD = 12,
+ VOMIT = 13,
+ SALT = 14,
+ FILTH = 15,
+ FILTH_FROZEN = 16,
+ UNKOWN_FROZEN = 17,
+ GRIME = 18,
+ ICHOR = 20,
+ LEATHER = 37,
+ BLOOD_1 = 39,
+ BLOOD_2 = 40,
+ BLOOD_3 = 41,
+ BLOOD_4 = 42,
+ BLOOD_5 = 43,
+ BLOOD_6 = 44,
+ BLOOD_NAMED = 242,
+ WOOD = 420,
+ PLANTCLOTH = 421,
+};
#define NUM_FORMS 5
#define FORM_BAR 1