X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=7369204ebdd1824efb56336d1a7c38e98664bfc2;hb=e7b76642d8998c250272a8313ad8aa7c7efff319;hp=ca3f194a4d6dcee78700d47daf73729eab766145;hpb=b37c82db3e3baee0425f35e2183c8ccff6e9ebe7;p=lugaru.git

diff --git a/Source/Game.h b/Source/Game.h
index ca3f194..7369204 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,21 +23,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "SDL.h"
 
-#if (defined(__APPLE__) && defined(__MACH__))
-#  ifdef PLATFORM_MACOSX
-#    error Do not define PLATFORM_MACOSX for new builds. It is for the old Carbonized build.
-#  endif
-#endif
-
-#ifdef PLATFORM_MACOSX
-#include <Carbon.h>
-#include "Quicktime.h"
-#endif
-
-//Jordan included glut.h
-//#include <glut.h>
-
-#include "TGALoader.h"
+#include "ImageIO.h"
 
 #include "Terrain.h"
 #include "Skybox.h"
@@ -45,10 +32,8 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Lights.h"
 #include "Person.h"
 #include "Sprite.h"
-//#include <agl.h>
 #include "Text.h"
 #include "Objects.h"
-//#include <DrawSprocket.h>
 #include "Weapons.h"
 #include "binio.h"
 #include <fstream>
@@ -57,6 +42,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Account.h"
 #include "Sounds.h"
 #include "Texture.h"
+#include "optionparser.h"
 
 #define NB_CAMPAIGN_MENU_ITEM 7
 
@@ -164,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();
@@ -179,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
@@ -208,31 +193,6 @@ extern "C" {
 #define STUBBED(x) { static bool seen = false; if (!seen) { seen = true; fprintf(stderr, "STUBBED: %s at %s:%d\n", x, __FILE__, __LINE__); } }
 //#define STUBBED(x)
 
-extern int numdialogues;
-const int max_dialogues = 20;
-const int max_dialoguelength = 20;
-extern int numdialogueboxes[max_dialogues];
-extern int dialoguetype[max_dialogues];
-extern int dialogueboxlocation[max_dialogues][max_dialoguelength];
-extern float dialogueboxcolor[max_dialogues][max_dialoguelength][3];
-extern int dialogueboxsound[max_dialogues][max_dialoguelength];
-extern char dialoguetext[max_dialogues][max_dialoguelength][128];
-extern char dialoguename[max_dialogues][max_dialoguelength][64];
-extern XYZ dialoguecamera[max_dialogues][max_dialoguelength];
-extern XYZ participantlocation[max_dialogues][10];
-extern int participantfocus[max_dialogues][max_dialoguelength];
-extern int participantaction[max_dialogues][max_dialoguelength];
-extern float participantyaw[max_dialogues][10];
-extern XYZ participantfacing[max_dialogues][max_dialoguelength][10];
-extern float dialoguecamerayaw[max_dialogues][max_dialoguelength];
-extern float dialoguecamerapitch[max_dialogues][max_dialoguelength];
-extern int indialogue;
-extern int whichdialogue;
-extern int directing;
-extern float dialoguetime;
-extern int dialoguegonethrough[20];
-extern float tintr, tintg, tintb;
-
 enum maptypes {
     mapkilleveryone, mapgosomewhere,
     mapkillsomeone, mapkillmost // These two are unused
@@ -254,4 +214,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