Adds a warning message when more than one map is included.

Tweaked dm.sh to ignore this message when it sets a single map to be included. Signed-off-by: Mloc <[email protected]>
RPOD · Jan 13, 2014 · d9174d1 · d9174d1
1 parent 2f931ae
commit d9174d1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/_maps/metastation.dm b/_maps/metastation.dm
@@ -1,8 +1,12 @@
-#ifndef MAP_FILE
+#if !defined(MAP_FILE)
 
         #include "map_files\MetaStation.v39A.III.dmm"
 
         #define MAP_FILE "MetaStation.v39A.III.dmm"
         #define MAP_NAME "MetaStation"
 
+#elif !defined(MAP_OVERRIDE)
+
+	#warn a map has already been included, ignoring MetaStation.
+
 #endif
diff --git a/_maps/tgstation2.dm b/_maps/tgstation2.dm
@@ -1,8 +1,12 @@
-#ifndef MAP_FILE
+#if !defined(MAP_FILE)
 
         #include "map_files\tgstation.2.1.2.dmm"
 
         #define MAP_FILE "tgstation.2.1.2.dmm"
         #define MAP_NAME "/tg/station 2"
 
+#elif !defined(MAP_OVERRIDE)
+
+	#warn a map has already been included, ignoring /tg/station 2.
+
 #endif
diff --git a/dm.sh b/dm.sh
@@ -40,6 +40,7 @@ do
 	fi
 	if [[ $var == -M* ]]
 	then
+		sed -i '1s/^/#define MAP_OVERRIDE\n/' $dmepath.mdme
 		sed -i 's!// BEGIN_INCLUDE!// BEGIN_INCLUDE\n#include "_maps\\'$arg'.dm"!' $dmepath.mdme
 		continue
 	fi