X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ABM2%2Fmain.cpp;h=210382e119bf86f02aeceb9219f0a31240361bbb;hb=4ffda2ad2aa90d275826e31f40233014faaa01d8;hp=7348a15fa1545965c41d68edc2beb71bdea65c6d;hpb=357a451150c18b27f99cecd5f9d13be1ae5a9fdf;p=matthijs%2FABM2.git

diff --git a/ABM2/main.cpp b/ABM2/main.cpp
index 7348a15..210382e 100755
--- a/ABM2/main.cpp
+++ b/ABM2/main.cpp
@@ -4,15 +4,9 @@
 #include <windowsx.h>
 #endif
 
-//#ifndef WIN32
-	/* HACKS */
-#define max(a,b) (a>b?a:b)
-#define min(a,b) (a<b?a:b)
-#define GetTickCount() 0
-//#endif // !WIN32
-
 #include "Engine/engine.h"
 #include "Engine/game.h"
+#include "Engine/SpriteManager.h"
 #include "Playground.h"
 #include "SchemeReader.h"
 
@@ -20,6 +14,12 @@
 #define SCREEN_WIDTH  640
 #define SCREEN_HEIGHT 480
 
+SpriteData defaultSprites[] = {
+	{SPR_FIELD, "Data/FIELD0.png", 640, 480},
+	{SPR_TILE, "Data/Tiles0.png", 40, 36},
+	{SPR_NONE, NULL, 0, 0}
+};
+
 #ifdef WIN32
 HINSTANCE hInstance;
 HWND hWnd;
@@ -162,10 +162,14 @@ void CApplication::Run(int argc, char *argv[])
 	globalTimer->priority=10;
 	CKernel::GetSingleton().AddTask(CMMPointer<ITask>(globalTimer));
 
-	Playground game;
+	CSpriteManager *sm = new CSpriteManager(videoTask->getGraphics(), defaultSprites);
+	CKernel::GetSingleton().setSpriteManager(sm);
+
+	Playground game(&CKernel::GetSingleton());
 	game.priority=100;
 	CKernel::GetSingleton().AddTask(CMMPointer<ITask>(&game));
 
+
 	//set up the profiler with an output handler
 	CProfileLogHandler profileLogHandler;
 	CProfileSample::outputHandler=&profileLogHandler;