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

diff --git a/ABM2/main.cpp b/ABM2/main.cpp
index e325647..210382e 100755
--- a/ABM2/main.cpp
+++ b/ABM2/main.cpp
@@ -14,18 +14,9 @@
 #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_FIELD, "Data/FIELD0.png", 640, 480},
+	{SPR_TILE, "Data/Tiles0.png", 40, 36},
 	{SPR_NONE, NULL, 0, 0}
 };
 
@@ -174,10 +165,11 @@ void CApplication::Run(int argc, char *argv[])
 	CSpriteManager *sm = new CSpriteManager(videoTask->getGraphics(), defaultSprites);
 	CKernel::GetSingleton().setSpriteManager(sm);
 
-	Playground game;
+	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;