Fixed a lot of warnings

[lugaru.git] / Source / Game.cpp

diff --git a/Source/Game.cpp b/Source/Game.cpp
index 16014421732bfa4904e70777d8efc968c85c2265..a70776fccd7a06c2f8f71e86fafc5d76c84d9095 100644 (file)
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -47,6 +47,12 @@ int directing;
 float dialoguetime;
 int dialoguegonethrough[20];
 
+const char *pathtypenames[] = {"keepwalking", "pause"};
+const char *editortypenames[] = {
+    "active", "sitting", "sitting wall", "sleeping",
+    "dead1", "dead2", "dead3", "dead4"
+};
+
 namespace Game
 {
 Texture terraintexture;
@@ -124,17 +130,16 @@ int numchallengelevels = 0;
 
 bool console = false;
 std::string consoletext[15] = {};
-bool chatting = 0;
 std::string displaytext[15] = {};
 float displaytime[15] = {};
 float displayblinkdelay = 0;
 bool displayblink = 0;
-int displayselected = 0;
+unsigned displayselected = 0;
 float consoleblinkdelay = 0;
 bool consoleblink = 0;
-int consoleselected = 0;
+unsigned consoleselected = 0;
 
-unsigned short crouchkey = 0, jumpkey = 0, forwardkey = 0, chatkey = 0, backkey = 0, leftkey = 0, rightkey = 0, drawkey = 0, throwkey = 0, attackkey = 0;
+unsigned short crouchkey = 0, jumpkey = 0, forwardkey = 0, backkey = 0, leftkey = 0, rightkey = 0, drawkey = 0, throwkey = 0, attackkey = 0;
 unsigned short consolekey = 0;
 
 int loading = 0;
@@ -152,7 +157,7 @@ void Game::fireSound(int sound)
     emit_sound_at(sound);
 }
 
-void Game::inputText(string& str, int* charselected)
+void Game::inputText(string& str, unsigned* charselected)
 {
     SDL_Event evenement;