X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=43f256e9f645cb2127aa92795a74234fae2b4e6b;hb=afc437d91c5c31a6569349a118ace6876737889f;hp=4f7a2aaa1422b797386d41347a9bf31250a20d57;hpb=757fd9c1ec8d263225df90ef486051712f448483;p=lugaru.git diff --git a/Source/Game.h b/Source/Game.h index 4f7a2aa..43f256e 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -27,7 +27,7 @@ along with Lugaru. If not, see . #include "Terrain.h" #include "Skybox.h" -#include "Skeleton.h" +#include "Animation/Skeleton.h" #include "Models.h" #include "Lights.h" #include "Person.h" @@ -147,7 +147,6 @@ void LoadStuff(); void LoadScreenTexture(); void LoadingScreen(); int DrawGLScene(StereoSide side); -void LoadMenu(); void playdialoguescenesound(); int findClosestPlayer(); void Loadlevel(int which); @@ -161,7 +160,6 @@ int checkcollide(XYZ startpoint, XYZ endpoint); int checkcollide(XYZ startpoint, XYZ endpoint, int what); void fireSound(int sound = fireendsound); -void setKeySelected(); void inputText(std::string& str, unsigned* charselected); void flash(float amount = 1, int delay = 1); @@ -218,11 +216,11 @@ SDL_bool sdlEventProc(const SDL_Event &e); -enum optionIndex { UNKNOWN, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS }; +enum optionIndex { UNKNOWN, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS, DEBUG }; /* Number of options + 1 */ -const int commandLineOptionsNumber = 8; +const int commandLineOptionsNumber = 9; -extern const option::Descriptor usage[12]; +extern const option::Descriptor usage[13]; extern option::Option commandLineOptions[commandLineOptionsNumber]; extern option::Option* commandLineOptionsBuffer;