X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FGame.cpp;h=54b4f2f6907d11bc702ef2e972d2e602ad7ed433;hp=0fe8e53fea2da730f42650ce8bf25e8d05cf28f5;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hpb=531fd8d27258d6c15d6fd221272c74b48602a85a diff --git a/Source/Game.cpp b/Source/Game.cpp index 0fe8e53..54b4f2f 100644 --- a/Source/Game.cpp +++ b/Source/Game.cpp @@ -27,8 +27,8 @@ along with Lugaru. If not, see . 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" }; @@ -62,7 +62,7 @@ int oldmousecoordh = 0; int oldmousecoordv = 0; float yaw = 0; float pitch = 0; -SkyBox *skybox = NULL; +SkyBox* skybox = NULL; bool cameramode = 0; bool firstLoadDone = false; @@ -89,8 +89,8 @@ int musictype = 0; XYZ mapcenter; float mapradius = 0; -Text *text = NULL; -Text *textmono = NULL; +Text* text = NULL; +Text* textmono = NULL; float fps = 0; bool editorenabled = 0; @@ -149,41 +149,41 @@ 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; } }