Move map/waypoint/pose types to Game.h

diff --git a/Source/Constants.h b/Source/Constants.h
index 1d8906fe5ca669dee57220b798e58acb61852fc0..1b851559f942a9b4db19452a09811c7235aba7f8 100644 (file)
--- a/Source/Constants.h
+++ b/Source/Constants.h
@@ -25,21 +25,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // cat src/Constants.h | sed -e 's/#define/const int/' -e 's/ [0-9]*$/ =&;/'
 // chew on that --Jookia
 
-const int mapkilleveryone = 0;
-const int mapgosomewhere = 1;
-const int mapkillsomeone = 2;
-const int mapkillmost = 3;
-
-enum pathtypes {wpkeepwalking, wppause};
-
-static const char *pathtypenames[] = {"keepwalking", "pause"};
-
-enum editortypes {typeactive, typesitting, typesittingwall, typesleeping,
-                 typedead1, typedead2, typedead3, typedead4};
-
-static const char *editortypenames[] = {
-  "active", "sitting", "sitting wall", "sleeping",
-  "dead1", "dead2", "dead3", "dead4"
-};
-
 #endif

diff --git a/Source/Game.h b/Source/Game.h
index 867754de0015c1b3e9940c501fcb7741f8a05e65..33e61c49fe547eb38eae8310f4d329505cbab4b1 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -345,4 +345,21 @@ extern int directing;
 extern float dialoguetime;
 extern int dialoguegonethrough[20];
 
+enum maptypes {
+  mapkilleveryone, mapgosomewhere,
+  mapkillsomeone, mapkillmost // These two are unused
+};
+
+enum pathtypes {wpkeepwalking, wppause};
+
+static const char *pathtypenames[] = {"keepwalking", "pause"};
+
+enum editortypes {typeactive, typesitting, typesittingwall, typesleeping,
+                 typedead1, typedead2, typedead3, typedead4};
+
+static const char *editortypenames[] = {
+  "active", "sitting", "sitting wall", "sleeping",
+  "dead1", "dead2", "dead3", "dead4"
+};
+
 #endif