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

diff --git a/ABM2/main.cpp b/ABM2/main.cpp
index 7348a15..e325647 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,21 @@
 #define SCREEN_WIDTH  640
 #define SCREEN_HEIGHT 480
 
+enum SpriteID {
+	SPR_NONE = 0,
+	SPR_FIELD,
+	SPR_SOLID,
+	SPR_BRICK,
+	SPR_BLANK,
+	SPR_PLAYER,
+};
+
+SpriteData defaultSprites[] = {
+	{SPR_FIELD, "FIELD0.png", 640, 480},
+	{SPR_BLANK, "FIELD0.png", 640, 480},
+	{SPR_NONE, NULL, 0, 0}
+};
+
 #ifdef WIN32
 HINSTANCE hInstance;
 HWND hWnd;
@@ -162,6 +171,9 @@ void CApplication::Run(int argc, char *argv[])
 	globalTimer->priority=10;
 	CKernel::GetSingleton().AddTask(CMMPointer<ITask>(globalTimer));
 
+	CSpriteManager *sm = new CSpriteManager(videoTask->getGraphics(), defaultSprites);
+	CKernel::GetSingleton().setSpriteManager(sm);
+
 	Playground game;
 	game.priority=100;
 	CKernel::GetSingleton().AddTask(CMMPointer<ITask>(&game));