X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.cpp;h=5465a8e96012356bda8072a3c851ac02d2bb8e26;hb=0aab437dc560d2afa982e61cc2547756ad7b0761;hp=7efff10ea413b28276b053c00dfb6dee58b56db5;hpb=e7b76642d8998c250272a8313ad8aa7c7efff319;p=lugaru.git

diff --git a/Source/Game.cpp b/Source/Game.cpp
index 7efff10..5465a8e 100644
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -18,15 +18,17 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Game.h"
-#include "openal_wrapper.h"
-#include "SDL_thread.h"
-#include "Dialog.h"
+#include "Game.hpp"
+
+#include "Audio/openal_wrapper.hpp"
+#include "Level/Dialog.hpp"
+
+#include <SDL_thread.h>
 
 extern int mainmenu;
 
-const char *pathtypenames[] = {"keepwalking", "pause"};
-const char *editortypenames[] = {
+const char* pathtypenames[] = { "keepwalking", "pause" };
+const char* editortypenames[] = {
     "active", "sitting", "sitting wall", "sleeping",
     "dead1", "dead2", "dead3", "dead4"
 };
@@ -60,14 +62,16 @@ int oldmousecoordh = 0;
 int oldmousecoordv = 0;
 float yaw = 0;
 float pitch = 0;
-SkyBox *skybox = NULL;
+SkyBox* skybox = NULL;
 bool cameramode = 0;
-bool firstload = 0;
+bool firstLoadDone = false;
 
 Texture hawktexture;
 float hawkyaw = 0;
 float hawkcalldelay = 0;
+
 float leveltime = 0;
+float wonleveltime = 0;
 float loadtime = 0;
 
 Model hawk;
@@ -85,7 +89,8 @@ int musictype = 0;
 XYZ mapcenter;
 float mapradius = 0;
 
-Text *text = NULL;
+Text* text = NULL;
+Text* textmono = NULL;
 float fps = 0;
 
 bool editorenabled = 0;
@@ -108,11 +113,6 @@ int numchallengelevels = 0;
 
 bool console = false;
 std::string consoletext[15] = {};
-std::string displaytext[15] = {};
-float displaytime[15] = {};
-float displayblinkdelay = 0;
-bool displayblink = 0;
-unsigned displayselected = 0;
 float consoleblinkdelay = 0;
 bool consoleblink = 0;
 unsigned consoleselected = 0;
@@ -127,7 +127,6 @@ int targetlevel = 0;
 float changedelay = 0;
 
 bool waiting = false;
-Account* accountactive = NULL;
 }
 
 void Game::fireSound(int sound)
@@ -150,41 +149,43 @@ void Game::inputText(string& str, unsigned* charselected)
             break;
         }
         switch (evenement.type) {
-        case SDL_TEXTEDITING:
-            /* FIXME - We should handle this for complete input method support */
-            break;
-        case SDL_TEXTINPUT:
-            str.insert(*charselected, evenement.text.text);
-            (*charselected) += strlen(evenement.text.text);
-            break;
-        case SDL_KEYDOWN:
-            if (evenement.key.keysym.sym == SDLK_ESCAPE) {
-                str.clear();
-                *charselected = 0;
-                waiting = false;
-            } else if (evenement.key.keysym.sym == SDLK_BACKSPACE) {
-                if ((*charselected) > 0) {
-                    (*charselected)--;
-                    str.erase(*charselected, 1);
+            case SDL_TEXTEDITING:
+                /* FIXME - We should handle this for complete input method support */
+                break;
+            case SDL_TEXTINPUT:
+                str.insert(*charselected, evenement.text.text);
+                (*charselected) += strlen(evenement.text.text);
+                break;
+            case SDL_KEYDOWN:
+                if (evenement.key.keysym.sym == SDLK_ESCAPE) {
+                    str.clear();
+                    *charselected = 0;
+                    waiting = false;
+                } else if (evenement.key.keysym.sym == SDLK_BACKSPACE) {
+                    if ((*charselected) > 0) {
+                        (*charselected)--;
+                        str.erase(*charselected, 1);
+                    }
+                } else if (evenement.key.keysym.sym == SDLK_DELETE) {
+                    if ((*charselected) < str.size()) {
+                        str.erase(*charselected, 1);
+                    }
+                } else if (evenement.key.keysym.sym == SDLK_HOME) {
+                    (*charselected) = 0;
+                } else if (evenement.key.keysym.sym == SDLK_END) {
+                    (*charselected) = str.size();
+                } else if (evenement.key.keysym.sym == SDLK_LEFT) {
+                    if ((*charselected) != 0) {
+                        (*charselected)--;
+                    }
+                } else if (evenement.key.keysym.sym == SDLK_RIGHT) {
+                    if ((*charselected) < str.size()) {
+                        (*charselected)++;
+                    }
+                } else if (evenement.key.keysym.sym == SDLK_RETURN) {
+                    waiting = false;
                 }
-            } else if (evenement.key.keysym.sym == SDLK_DELETE) {
-                if ((*charselected) < str.size()) {
-                    str.erase(*charselected, 1);
-                }
-            } else if (evenement.key.keysym.sym == SDLK_HOME) {
-                (*charselected) = 0;
-            } else if (evenement.key.keysym.sym == SDLK_END) {
-                (*charselected) = str.size();
-            } else if (evenement.key.keysym.sym == SDLK_LEFT) {
-                if ((*charselected) != 0)
-                    (*charselected)--;
-            } else if (evenement.key.keysym.sym == SDLK_RIGHT) {
-                if ((*charselected) < str.size())
-                    (*charselected)++;
-            } else if (evenement.key.keysym.sym == SDLK_RETURN) {
-                waiting = false;
-            }
-            break;
+                break;
         }
     }
 
@@ -192,76 +193,3 @@ void Game::inputText(string& str, unsigned* charselected)
         SDL_StopTextInput();
     }
 }
-
-int setKeySelected_thread(void* data)
-{
-    using namespace Game;
-    int scancode = -1;
-    SDL_Event evenement;
-    while (scancode == -1) {
-        SDL_WaitEvent(&evenement);
-        switch (evenement.type) {
-        case SDL_KEYDOWN:
-            scancode = evenement.key.keysym.scancode;
-            break;
-        case SDL_MOUSEBUTTONDOWN:
-            scancode = SDL_NUM_SCANCODES + evenement.button.button;
-            break;
-        default:
-            break;
-        }
-    }
-    if (scancode != SDL_SCANCODE_ESCAPE) {
-        fireSound();
-        switch (keyselect) {
-        case 0:
-            forwardkey = scancode;
-            break;
-        case 1:
-            backkey = scancode;
-            break;
-        case 2:
-            leftkey = scancode;
-            break;
-        case 3:
-            rightkey = scancode;
-            break;
-        case 4:
-            crouchkey = scancode;
-            break;
-        case 5:
-            jumpkey = scancode;
-            break;
-        case 6:
-            drawkey = scancode;
-            break;
-        case 7:
-            throwkey = scancode;
-            break;
-        case 8:
-            attackkey = scancode;
-            break;
-        case 9:
-            consolekey = scancode;
-            break;
-        default:
-            break;
-        }
-    }
-    keyselect = -1;
-    waiting = false;
-    LoadMenu();
-    return 0;
-}
-
-void Game::setKeySelected()
-{
-    waiting = true;
-    printf("launch thread\n");
-    SDL_Thread* thread = SDL_CreateThread(setKeySelected_thread, NULL, NULL);
-    if ( thread == NULL ) {
-        fprintf(stderr, "Unable to create thread: %s\n", SDL_GetError());
-        waiting = false;
-        return;
-    }
-}