Reading debug mode from config again, but command line option overrides it

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index 7ccc49f875b3a7866607e5e7c35a19d806b88174..68a23a3d979c8b95113ea0b422a7fbc731ed8372 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -27,7 +27,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Terrain.h"
 #include "Skybox.h"
-#include "Skeleton.h"
+#include "Animation/Skeleton.h"
 #include "Models.h"
 #include "Lights.h"
 #include "Person.h"
@@ -76,6 +76,7 @@ extern bool cameramode;
 extern bool firstload;
 
 extern float leveltime;
+extern float wonleveltime;
 extern float loadtime;
 
 extern Model hawk;
@@ -147,11 +148,10 @@ void LoadStuff();
 void LoadScreenTexture();
 void LoadingScreen();
 int DrawGLScene(StereoSide side);
-void LoadMenu();
 void playdialoguescenesound();
 int findClosestPlayer();
 void Loadlevel(int which);
-void Loadlevel(const char *name);
+void Loadlevel(const std::string& name);
 void Tick();
 void TickOnce();
 void TickOnceAfter();
@@ -161,7 +161,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 +217,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;