Moved image loading/saving in TGALoader and renamed it accordingly

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index 5c3f80f766d6d4151b3e40e83789478d4e2862a0..0baa365c2719a04b13d2140b9931a9584718f580 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -22,21 +22,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 +31,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>
@@ -162,6 +146,11 @@ void LoadScreenTexture();
 void LoadingScreen();
 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();
 void TickOnce();
 void TickOnceAfter();
@@ -226,6 +215,7 @@ extern int whichdialogue;
 extern int directing;
 extern float dialoguetime;
 extern int dialoguegonethrough[20];
+extern float tintr, tintg, tintb;
 
 enum maptypes {
     mapkilleveryone, mapgosomewhere,
@@ -242,4 +232,10 @@ enum editortypes {typeactive, typesitting, typesittingwall, typesleeping,
 
 extern const char *editortypenames[8];
 
+extern const char *rabbitskin[10];
+
+extern const char *wolfskin[3];
+
+extern const char **creatureskin[2];
+
 #endif