X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=cbd70906449774cd5e7b5b5fa9b6ea72a18290da;hb=8866bcf90dba64f2fd6cecd6839b9b80988e46a6;hp=92bac482fa967aa2c59d64c384f70727f41d3d83;hpb=85c66654b25752485c9a4b4c534263df78e0ff78;p=lugaru.git

diff --git a/Source/Game.h b/Source/Game.h
index 92bac48..cbd7090 100644
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -1,6 +1,33 @@
+/*
+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 (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"
@@ -10,18 +37,21 @@
 //#include <glut.h>
 
 #include "TGALoader.h"
-#ifdef WIN32
-#include "WinInput.h"
-#elif USE_SDL
+
+#if USE_SDL
 #include "SDL.h"
-#include "SDLInput.h"
+#endif
+
+#if !PLATFORM_MACOSX
+#include "WinInput.h"
 #else
 #include "Macinput.h"
 #endif
+
 #include "Terrain.h"
 #include "Skybox.h"
 #include "Skeleton.h"
-#include "Models.h"   
+#include "Models.h"
 #include "Lights.h"
 #include "Person.h"
 #include "Constants.h"
@@ -38,7 +68,7 @@
 
 extern GLuint rabbittexture;
 
-class Game		
+class Game
 {
 public:
 
@@ -220,7 +250,7 @@ public:
 	void LoadingScreen();
 	void FadeLoadingScreen(float howmuch);
 	void Dispose();
-	int DrawGLScene(GLvoid);
+	int DrawGLScene(void);
 	void Tick();
 	void TickOnce();
 	void TickOnceAfter();
@@ -249,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] );
 		}
@@ -297,4 +327,9 @@ static __forceinline void swap_gl_buffers(void)
 #define LONGLONGCONST(x) (x)
 #endif
 
+extern "C" { void UndefinedSymbolToExposeStubbedCode(void); }
+//#define STUBBED(x) UndefinedSymbolToExposeStubbedCode();
+#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)
+
 #endif