Fixed #11 so that we can close the window while editing text

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index ca3f194a4d6dcee78700d47daf73729eab766145..b5a16c6bf2fec9b1e04381f8e381d3fda424ae87 100644 (file)
--- 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>
@@ -164,7 +149,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();
@@ -231,7 +215,6 @@ extern int whichdialogue;
 extern int directing;
 extern float dialoguetime;
 extern int dialoguegonethrough[20];
-extern float tintr, tintg, tintb;
 
 enum maptypes {
     mapkilleveryone, mapgosomewhere,
@@ -254,4 +237,7 @@ extern const char *wolfskin[3];
 
 extern const char **creatureskin[2];
 
+SDL_bool sdlEventProc(const SDL_Event &e);
+
+
 #endif