X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.hpp;h=d14037f79dca0486187060a5de8d38415265dfc6;hb=0aab437dc560d2afa982e61cc2547756ad7b0761;hp=0dcee30ea483ab7778362cb009228c09d8bdf1ac;hpb=22dedb8ee79dd55169b8fdb07f1a12a0d6acd22d;p=lugaru.git diff --git a/Source/Game.hpp b/Source/Game.hpp index 0dcee30..d14037f 100644 --- a/Source/Game.hpp +++ b/Source/Game.hpp @@ -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. @@ -98,6 +98,7 @@ extern XYZ mapcenter; extern float mapradius; extern Text *text; +extern Text *textmono; extern float fps; extern bool editorenabled; @@ -143,8 +144,8 @@ void LoadingScreen(); int DrawGLScene(StereoSide side); void playdialoguescenesound(); int findClosestPlayer(); -void Loadlevel(int which); -void Loadlevel(const std::string& name, bool tutorial = false); +bool LoadLevel(int which); +bool LoadLevel(const std::string& name, bool tutorial = false); void Tick(); void TickOnce(); void TickOnceAfter(); @@ -205,9 +206,9 @@ SDL_bool sdlEventProc(const SDL_Event &e); -enum optionIndex { UNKNOWN, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS, DEVTOOLS }; +enum optionIndex { UNKNOWN, VERSION, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS, DEVTOOLS }; /* Number of options + 1 */ -const int commandLineOptionsNumber = 9; +const int commandLineOptionsNumber = 10; extern const option::Descriptor usage[13];