summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-30 00:23:10 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-30 01:11:22 +0300
commit0903637f9479083a89689e54b6208cd8b19570a5 (patch)
tree4539455f5932acb1b5ab3a1d61faaeada02c6e81
parent3e42533e6935f6e8cf3a26cc96dcebe36056f4f3 (diff)
downloadhercules-0903637f9479083a89689e54b6208cd8b19570a5.tar.gz
hercules-0903637f9479083a89689e54b6208cd8b19570a5.tar.bz2
hercules-0903637f9479083a89689e54b6208cd8b19570a5.tar.xz
hercules-0903637f9479083a89689e54b6208cd8b19570a5.zip
Add #ifndef for different constants / sizes in status.h
-rw-r--r--src/map/status.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/status.h b/src/map/status.h
index 2b932b149..2f70ee41d 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -64,7 +64,9 @@ enum refine_type {
REFINE_TYPE_WEAPON2 = 2,
REFINE_TYPE_WEAPON3 = 3,
REFINE_TYPE_WEAPON4 = 4,
+#ifndef REFINE_TYPE_MAX
REFINE_TYPE_MAX = 5
+#endif
};
/**
@@ -825,8 +827,9 @@ typedef enum sc_type {
SC_M_LIFEPOTION,
SC_G_LIFEPOTION, // 640
SC_MYSTICPOWDER,
-
+#ifndef SC_MAX
SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
+#endif
} sc_type;
/// Official status change ids, used to display status icons in the client.
@@ -1792,8 +1795,9 @@ enum si_type {
//SI_EP16_2_BUFF_SS = 963,
//SI_EP16_2_BUFF_SC = 964,
//SI_EP16_2_BUFF_AC = 965,
-
+#ifndef SI_MAX
SI_MAX,
+#endif
};
// JOINTBEAT stackable ailments