Fixed a lot of warnings

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index 98f6f6405c11f19fc687fe1c6dfaeefb0f71f26c..b75d70914af059927438b50dbbe73d494ea8a72e 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -140,10 +140,10 @@ extern std::string displaytext[15];
 extern float displaytime[15];
 extern float displayblinkdelay;
 extern bool displayblink;
-extern int displayselected;
+extern unsigned displayselected;
 extern float consoleblinkdelay;
 extern bool consoleblink;
-extern int consoleselected;
+extern unsigned consoleselected;
 
 extern int oldenvironment;
 extern int targetlevel;
@@ -175,7 +175,7 @@ int checkcollide(XYZ startpoint, XYZ endpoint, int what);
 void fireSound(int sound = fireendsound);
 void setKeySelected();
 
-void inputText(std::string& str, int* charselected);
+void inputText(std::string& str, unsigned* charselected);
 void flash();
 }
 
@@ -236,15 +236,12 @@ enum maptypes {
 
 enum pathtypes {wpkeepwalking, wppause};
 
-static const char *pathtypenames[] = {"keepwalking", "pause"};
+extern const char *pathtypenames[2];
 
 enum editortypes {typeactive, typesitting, typesittingwall, typesleeping,
                   typedead1, typedead2, typedead3, typedead4
                  };
 
-static const char *editortypenames[] = {
-    "active", "sitting", "sitting wall", "sleeping",
-    "dead1", "dead2", "dead3", "dead4"
-};
+extern const char *editortypenames[8];
 
 #endif