Merge pull request #1138 from Citadel-Station-13/upstream-merge-27545

[MIRROR] Gibtonite now uses defines
2017-05-25 09:43:50 -05:00
parent 8316ad7f50 b8b879af45
commit 7ad5837432
2 changed files with 18 additions and 12 deletions
@@ -411,3 +411,9 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define NO_FIELD 0
 #define FIELD_TURF 1
 #define FIELD_EDGE 2
+
+//gibtonite state defines
+#define GIBTONITE_UNSTRUCK 0
+#define GIBTONITE_ACTIVE 1
+#define GIBTONITE_STABLE 2
+#define GIBTONITE_DETONATE 3