2 files changed, 23 insertions, 13 deletions
diff --git a/src/emap/enum/esctype.h b/src/emap/enum/esctype.h
index 28e3930..932d297 100644
--- a/src/emap/enum/esctype.h
+++ b/src/emap/enum/esctype.h
@@ -4,9 +4,14 @@
 #ifndef EVOL_MAP_ENUM_ESCTYPE
 #define EVOL_MAP_ENUM_ESCTYPE
 
+#ifndef OLD_SC_MAX
+#define OLD_SC_MAX 0
+#error "vars.sh did not define OLD_SC_MAX"
+#endif
+
 typedef enum esc_type
 {
-    SC_PHYSICAL_SHIELD = 654,
+    SC_PHYSICAL_SHIELD = OLD_SC_MAX, // defined in vars.sh
 } esc_type;
 
 #endif  // EVOL_MAP_ENUM_ESCTYPE
diff --git a/src/emap/enum/esitype.h b/src/emap/enum/esitype.h
index 2791bd4..7dd10a7 100644
--- a/src/emap/enum/esitype.h
+++ b/src/emap/enum/esitype.h
@@ -4,20 +4,25 @@
 #ifndef EVOL_MAP_ENUM_ESITYPE
 #define EVOL_MAP_ENUM_ESITYPE
 
+#ifndef OLD_SI_MAX
+#define OLD_SI_MAX 0
+#error "vars.sh did not define OLD_SI_MAX"
+#endif
+
 enum esi_type
 {
-    SI_PHYSICAL_SHIELD = 966,
-    //SI_EVOL_INCSTR = 970,
-    SI_EVOL_INCAGI = 971,
-    SI_EVOL_INCVIT = 972,
-    SI_EVOL_INCINT = 973,
-    SI_EVOL_INCDEX = 974,
-    SI_EVOL_INCLUK = 975,
-    SI_EVOL_INCHIT = 976,
-    SI_EVOL_INCFLEE = 977,
-    SI_EVOL_WALKSPEED = 978,
-    SI_EVOL_INCMHPRATE = 979,
-    SI_EVOL_INCMSPRATE = 980,
+    SI_PHYSICAL_SHIELD = OLD_SI_MAX, // defined in vars.sh
+    SI_EVOL_INCSTR,
+    SI_EVOL_INCAGI,
+    SI_EVOL_INCVIT,
+    SI_EVOL_INCINT,
+    SI_EVOL_INCDEX,
+    SI_EVOL_INCLUK,
+    SI_EVOL_INCHIT,
+    SI_EVOL_INCFLEE,
+    SI_EVOL_WALKSPEED,
+    SI_EVOL_INCMHPRATE,
+    SI_EVOL_INCMSPRATE,
 };
 
 #endif  // EVOL_MAP_ENUM_ESITYPE