X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=727b9985d3eab9d660734468e77f54e72de13707;hb=612415ff494c29cf2fc7ea560da9908eaff7d847;hp=fd95830eb248f8abfdb2a691f6424a46bb4fa348;hpb=bfbec1fc01aa8ef6f3e4a6ed63b51a0605df3c79;p=lugaru.git

diff --git a/Source/Game.h b/Source/Game.h
index fd95830..727b998 100644
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -1,6 +1,37 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #ifndef _GAME_H_
 #define _GAME_H_
 
+#if USE_SDL
+#include "SDL.h"
+#endif
+
+#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"
@@ -11,10 +42,6 @@
 
 #include "TGALoader.h"
 
-#if USE_SDL
-#include "SDL.h"
-#endif
-
 #if !PLATFORM_MACOSX
 #include "WinInput.h"
 #else
@@ -24,11 +51,10 @@
 #include "Terrain.h"
 #include "Skybox.h"
 #include "Skeleton.h"
-#include "Models.h"   
+#include "Models.h"
 #include "Lights.h"
 #include "Person.h"
 #include "Constants.h"
-#include "fmod.h"
 #include "Sprites.h"
 //#include <agl.h>
 #include "Text.h"
@@ -41,7 +67,7 @@
 
 extern GLuint rabbittexture;
 
-class Game		
+class Game
 {
 public:
 
@@ -214,10 +240,10 @@ public:
 	bool oldattackkey;
 
 	long long MD5_string (char *string);
-	static void LoadTexture(char *fileName, GLuint *textureid,int mipmap, bool hasalpha);
-	static void LoadTextureSave(char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize);
-	void LoadSave(char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize);
-	bool AddClothes(char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize);
+	static void LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha);
+	static void LoadTextureSave(const char *fileName, GLuint *textureid,int mipmap,GLubyte *array, int *skinsize);
+	void LoadSave(const char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize);
+	bool AddClothes(const char *fileName, GLuint *textureid,bool mipmap,GLubyte *array, int *skinsize);
 	void InitGame();
 	void LoadStuff();
 	void LoadingScreen();
@@ -252,7 +278,7 @@ public:
 	int musicselected;
 	int change;
 	Game();
-	~Game() {		
+	~Game() {
 		for(int i=0;i<10;i++){
 			if(Mainmenuitems[i])glDeleteTextures( 1, &Mainmenuitems[i] );
 		}