X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=45d9eb8c442cfd92702408a85d632254dac6f97c;hb=bccce69852faf174b633e3e85b975639bfab146f;hp=d5978de94d2fde3bb52aa909ce82d3f627e0e117;hpb=ff50d2ebce620062b6988247293af3a7e3b7ab90;p=lugaru.git

diff --git a/Source/Game.h b/Source/Game.h
index d5978de..45d9eb8 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,7 +51,7 @@
 #include "Terrain.h"
 #include "Skybox.h"
 #include "Skeleton.h"
-#include "Models.h"   
+#include "Models.h"
 #include "Lights.h"
 #include "Person.h"
 #include "Constants.h"
@@ -41,7 +68,7 @@
 
 extern GLuint rabbittexture;
 
-class Game		
+class Game
 {
 public:
 
@@ -214,16 +241,16 @@ 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();
 	void FadeLoadingScreen(float howmuch);
 	void Dispose();
-	int DrawGLScene(GLvoid);
+	int DrawGLScene(void);
 	void Tick();
 	void TickOnce();
 	void TickOnceAfter();
@@ -252,7 +279,7 @@ public:
 	int musicselected;
 	int change;
 	Game();
-	~Game() {		
+	~Game() {
 		for(int i=0;i<10;i++){
 			if(Mainmenuitems[i])glDeleteTextures( 1, &Mainmenuitems[i] );
 		}