X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FGame.cpp;h=0fe8e53fea2da730f42650ce8bf25e8d05cf28f5;hb=8b8230c564e1f0063b381e77bf6222af9f2e678d;hp=e740aa607f7125da558cb120d91ee423b2dad051;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git diff --git a/Source/Game.cpp b/Source/Game.cpp index e740aa6..0fe8e53 100644 --- a/Source/Game.cpp +++ b/Source/Game.cpp @@ -18,11 +18,12 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "SDL_thread.h" -#include "Game.h" -#include "Audio/openal_wrapper.h" -#include "Level/Dialog.h" +#include "Game.hpp" +#include "Audio/openal_wrapper.hpp" +#include "Level/Dialog.hpp" + +#include extern int mainmenu; @@ -63,7 +64,7 @@ float yaw = 0; float pitch = 0; SkyBox *skybox = NULL; bool cameramode = 0; -bool firstload = 0; +bool firstLoadDone = false; Texture hawktexture; float hawkyaw = 0; @@ -89,6 +90,7 @@ XYZ mapcenter; float mapradius = 0; Text *text = NULL; +Text *textmono = NULL; float fps = 0; bool editorenabled = 0; @@ -111,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;