X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ABM2%2FPlayground.cpp;h=358262fa400dffc85e9324dfcd52694f6c1362ef;hb=c858b6b4ba3ec3262255baef5659f632efb3bf9f;hp=27f1f72ee591df6d8e244bdddfd71116348ce17a;hpb=4ab7ea7617b0c8cb1ab19bea1d439b3d1bb9839c;p=matthijs%2FABM2.git

diff --git a/ABM2/Playground.cpp b/ABM2/Playground.cpp
index 27f1f72..358262f 100755
--- a/ABM2/Playground.cpp
+++ b/ABM2/Playground.cpp
@@ -71,22 +71,15 @@ bool Playground::Start()
 	#endif
 	// init playing field
 	SchemeReader *scheme = new SchemeReader("Data/schemes/BASIC.SCH");
-	for (int i=0; i<PLAYGROUND_COLS; ++i) 
-	{
-		for (int j=0; j<PLAYGROUND_ROWS; ++j)
-		{
-			field[i][j] = NULL;
-		}
-	}
 
 	CMMPointer<Sprite> tile_sprite = this->getKernel()->getSpriteManager()->getSprite(SPR_TILE);
 	// put in non-destructible blocks
-	for (int i=0; i<PLAYGROUND_COLS; i++) 
+	for (int col=0; col<PLAYGROUND_COLS; col++) 
 	{
-		for (int j=0; j<PLAYGROUND_ROWS; j++)
+		for (int row=0; row<PLAYGROUND_ROWS; row++)
 		{
 			int subsprite = -1;
-			switch(scheme->PlayField[j*PLAYGROUND_NUMFIELD_X+i]) {
+			switch(scheme->PlayField[row*PLAYGROUND_NUMFIELD_X+col]) {
 				case BRICK:
 					subsprite = SPR_SUB_BRICK;
 					break;
@@ -95,7 +88,9 @@ bool Playground::Start()
 					break;
 			}
 			if (subsprite != -1)
-				field[i][j] = new Tile(tile_sprite, subsprite, i, j);
+				field[col][row] = new Tile(tile_sprite, subsprite, col, row);
+			else
+				field[col][row] = NULL;
 		}
 	}
 /*
@@ -133,7 +128,7 @@ 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));
+	s->blit(0, 0, 1.0, 1.0, 0, 0, COLOUR_RGBA(255, 255, 255, 255));
 	for (int i=0; i<PLAYGROUND_COLS; ++i) 
 	{
 		for (int j=0; j<PLAYGROUND_ROWS; ++j)
@@ -507,6 +502,11 @@ Tile::~Tile()
 }
 void Tile::Draw()
 {
+	this->sprite->blit(
+		PLAYGROUND_BORDER_LEFT + this->col * FIELD_UNIT_WIDTH,
+		PLAYGROUND_BORDER_TOP + this->row * FIELD_UNIT_HEIGHT,
+		1.0, 1.0, this->subsprite, 0, COLOUR_RGBA(255, 255, 255, 255)
+	);
 #ifdef WIN32
 	D3DXVECTOR3 center(0.0f, 0.0f, 0.0f);    // center at the upper-left corner
 	D3DXVECTOR3 position((FLOAT)PLAYGROUND_BORDER_LEFT+subitem_width*col, (FLOAT)PLAYGROUND_BORDER_TOP+subitem_height*row, 0.0f);    // position at 50, 50 with no depth