From: Alexander Monakov <amonakov@gmail.com>
Date: Mon, 3 Jan 2011 21:22:49 +0000 (+0300)
Subject: Move map/waypoint/pose types  to Game.h
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=b894601a50f6294d7cc4b6678fc6408f126eea5e;p=lugaru.git

Move map/waypoint/pose types  to Game.h
---

diff --git a/Source/Constants.h b/Source/Constants.h
index 1d8906f..1b85155 100644
--- 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 867754d..33e61c4 100644
--- 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