X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=inline;f=Source%2FGame.cpp;h=d362a54c97b322fa6ef9fbca778a6c73d5420e38;hb=380d8141271d6fa12954f6fe46e736315cffd594;hp=39b7df764627e1cb9ed0258acad3a9806afbf1ce;hpb=96f10b742814fab1d16e3fa704160773c3381795;p=lugaru.git
diff --git a/Source/Game.cpp b/Source/Game.cpp
index 39b7df7..d362a54 100644
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -18,15 +18,17 @@ You should have received a copy of the GNU General Public License
along with Lugaru. If not, see .
*/
-#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
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,9 +62,9 @@ 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;
@@ -87,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;
@@ -110,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;
@@ -129,7 +127,6 @@ int targetlevel = 0;
float changedelay = 0;
bool waiting = false;
-Account* accountactive = NULL;
}
void Game::fireSound(int sound)
@@ -152,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);
- }
- } else if (evenement.key.keysym.sym == SDLK_DELETE) {
- if ((*charselected) < str.size()) {
- 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_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;
}
}