X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ABM2%2FPlayground.cpp;h=41c8b4b55fd81e407adec9a2e3202dc2f2fbdb0d;hb=c100d6f67b06abb348319e277a66b6b7ab0c4bd5;hp=a7edd74752e1ab3e1cc067bf63c36489bc87f890;hpb=0835c5605c80efd286ccb7eff92fffc07689f359;p=matthijs%2FABM2.git

diff --git a/ABM2/Playground.cpp b/ABM2/Playground.cpp
index a7edd74..41c8b4b 100755
--- a/ABM2/Playground.cpp
+++ b/ABM2/Playground.cpp
@@ -1,13 +1,20 @@
 #include "Playground.h"
 
+#include "Engine/engine.h"
 #include "Engine/VideoUpdate.h"
 #include "SchemeReader.h"
 
+#if WIN32
 LPD3DXSPRITE d3dspt;
 LPD3DXFONT font;
 
+#endif
+
+Playground::Playground(CKernel* kernel) : ITask(kernel) { }
+
 bool Playground::Start()
 {
+	#if WIN32
 	background = NULL;
 	foreground = NULL;
 	font = NULL;
@@ -61,8 +68,9 @@ bool Playground::Start()
 		}
 	}
 
+	#endif
 	// init playing field
-	SchemeReader *scheme = new SchemeReader("data/schemes/BASIC.SCH");
+	SchemeReader *scheme = new SchemeReader("Data/schemes/BASIC.SCH");
 	for (int i=0; i<PLAYGROUND_COLS; ++i) 
 	{
 		for (int j=0; j<PLAYGROUND_ROWS; ++j)
@@ -79,7 +87,9 @@ bool Playground::Start()
 					//field[i][j] = new Item(foreground, 0, FIELD_UNIT_WIDTH, FIELD_UNIT_HEIGHT, i, j);
 					break;
 				case SOLID:
+					#ifdef WIN32
 					field[i][j] = new Item(foreground, 1, FIELD_UNIT_WIDTH, FIELD_UNIT_HEIGHT, i, j);
+					#endif // WIN32
 					break;
 			}
 /*
@@ -109,13 +119,16 @@ bool Playground::Start()
 		field[0][1] = NULL;
 	}
 
-
 	old_counter = GetTickCount();
 	return true;
 }
 
 void Playground::Update()
 {
+	CMMPointer<Sprite> s = this->getKernel()->getSpriteManager()->getSprite(SPR_FIELD);
+	
+	s->blit(0, 0, 1.0, 1.0, 0, 0, COLOUR_RGBA(0, 0, 255, 255));
+	#ifdef WIN32
 	if(CInputTask::keyDown(DIK_ESCAPE))CKernel::GetSingleton().KillAllTasks();
 
 	d3dspt->Begin(NULL);    // begin sprite drawing
@@ -165,7 +178,7 @@ void Playground::Update()
 	RECT rect3 = {310,10,500,36};
 	sprintf(buf, "(%d, %d) - (%d,%d)", bomberman->getFieldCenterX(), bomberman->getFieldCenterY(), bomberman->getOffsetX(), bomberman->getOffsetY());
 	font->DrawTextA(NULL, (char *)&buf, -1, &rect3, DT_LEFT, D3DCOLOR_XRGB(255,255,255));
-
+	#endif // WIN32
 
 	old_counter = GetTickCount();
 }
@@ -177,10 +190,12 @@ void Playground::Stop()
 			if (field[i][j] != NULL) delete field[i][j];
 
 	if (bomberman != NULL) delete bomberman;
+	#ifdef WIN32
 	if (background != NULL) background->Release();
 	if (foreground != NULL) foreground->Release();
 	if (d3dspt != NULL) d3dspt->Release();
 	if (font != NULL) font->Release();
+	#endif // WIN32
 }
 
 void Playground::move_down()
@@ -351,23 +366,29 @@ void Playground::move_right()
 
 Bomberman::Bomberman(int xloc, int yloc)
 {
+	#ifdef WIN32
 	HRESULT res = D3DXCreateTextureFromFile(d3ddev, L"data/powkick.png", &texture);
 	if (res != D3D_OK) texture = NULL;
+	#endif // WIN32
 	x = xloc;
 	y = yloc;
 }
 
 Bomberman::~Bomberman()
 {
+	#ifdef WIN32
 	if (texture != NULL) texture->Release();
+	#endif // WIN32
 }
 
 void Bomberman::Update()
 {
+	#ifdef WIN32
 	D3DXVECTOR3 center(0.0f, 0.0f, 0.0f);    // center at the upper-left corner
 	D3DXVECTOR3 position((FLOAT)x, (FLOAT)y, 0.0f);    // position at 50, 50 with no depth
 	RECT rect = {0,0,40,36};
 	d3dspt->Draw(texture, &rect, &center, &position, D3DCOLOR_XRGB(255,255,255));
+	#endif // WIN32
 }
 
 void Bomberman::move(int xloc, int yloc)
@@ -476,6 +497,7 @@ void Bomberman::move_to_direction(TMoveDirection dir)
 // Item class
 // =============================================
 
+#ifdef WIN32
 Item::	Item(LPDIRECT3DTEXTURE9 t, int texnr, int subwidth, int subheight, int colnr, int rownr)
 {
 	texture = t;
@@ -485,11 +507,13 @@ Item::	Item(LPDIRECT3DTEXTURE9 t, int texnr, int subwidth, int subheight, int co
 	subitem_height = subheight;
 	subitem_width = subwidth;
 }
+#endif // WIN32
 
 Item::~Item()
 {
 }
 
+#ifdef WIN32
 void Item::Draw()
 {
 	D3DXVECTOR3 center(0.0f, 0.0f, 0.0f);    // center at the upper-left corner
@@ -498,3 +522,4 @@ void Item::Draw()
 	d3dspt->Draw(texture, &rect, &center, &position, D3DCOLOR_ARGB(255, 255,255,255));
 }
 
+#endif // WIN32