X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=inline;f=Source%2FGame.h;h=c531c02f08f729bb08edffacd0372dc26d80c4ab;hb=faef1e1f8db1918c832c47109221d905bb81047b;hp=f554d1ee05e7fc0bd737fbc414f909fe584a7bd4;hpb=6aeefd781d62a9b5b8cf2f4d3a7ba4abaf82f54f;p=lugaru.git
diff --git a/Source/Game.h b/Source/Game.h
index f554d1e..c531c02 100644
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -1,5 +1,6 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
@@ -22,7 +23,7 @@ along with Lugaru. If not, see .
#include "SDL.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
#include "Terrain.h"
#include "Skybox.h"
@@ -41,6 +42,7 @@ along with Lugaru. If not, see .
#include "Account.h"
#include "Sounds.h"
#include "Texture.h"
+#include "optionparser.h"
#define NB_CAMPAIGN_MENU_ITEM 7
@@ -148,7 +150,6 @@ int DrawGLScene(StereoSide side);
void LoadMenu();
void playdialogueboxsound();
int findClosestPlayer();
-bool AddClothes(const char *fileName, GLubyte *array);
void Loadlevel(int which);
void Loadlevel(const char *name);
void Tick();
@@ -163,7 +164,7 @@ void fireSound(int sound = fireendsound);
void setKeySelected();
void inputText(std::string& str, unsigned* charselected);
-void flash();
+void flash(float amount = 1, int delay = 1);
}
#ifndef __forceinline
@@ -215,7 +216,6 @@ extern int whichdialogue;
extern int directing;
extern float dialoguetime;
extern int dialoguegonethrough[20];
-extern float tintr, tintg, tintb;
enum maptypes {
mapkilleveryone, mapgosomewhere,
@@ -238,4 +238,17 @@ extern const char *wolfskin[3];
extern const char **creatureskin[2];
+SDL_bool sdlEventProc(const SDL_Event &e);
+
+
+
+enum optionIndex { UNKNOWN, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS };
+/* Number of options + 1 */
+const int commandLineOptionsNumber = 8;
+
+extern const option::Descriptor usage[12];
+
+extern option::Option commandLineOptions[commandLineOptionsNumber];
+extern option::Option* commandLineOptionsBuffer;
+
#endif