X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.hpp;h=36ad6c8c4de0080ffc2bcd20b4b97cb8e87d4e60;hb=72217fbefd03881048287da8345925e1b89b5b9b;hp=f276ef0ddfb80bb3ce44beab369791ac1ab58574;hpb=5b566d01a77224e445ebb683184a1c59830a10b5;p=lugaru.git diff --git a/Source/Game.hpp b/Source/Game.hpp index f276ef0..36ad6c8 100644 --- a/Source/Game.hpp +++ b/Source/Game.hpp @@ -72,7 +72,7 @@ extern int oldmousecoordh, oldmousecoordv; extern float yaw, pitch; extern SkyBox *skybox; extern bool cameramode; -extern bool firstload; +extern bool firstLoadDone; extern float leveltime; extern float wonleveltime; @@ -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];