X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=fd95830eb248f8abfdb2a691f6424a46bb4fa348;hb=e0577022454729f0f0473c0191f831beaa72fcd1;hp=c4f033eb4c8e4cb7e81e6d74c5f563c7c1ef5960;hpb=1bbb44900613dcf8d7ec2d24c5ec3f04467b4281;p=lugaru.git diff --git a/Source/Game.h b/Source/Game.h index c4f033e..fd95830 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -10,14 +10,17 @@ //#include #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" @@ -220,7 +223,7 @@ public: void LoadingScreen(); void FadeLoadingScreen(float howmuch); void Dispose(); - int DrawGLScene(GLvoid); + int DrawGLScene(void); void Tick(); void TickOnce(); void TickOnceAfter();