Mercurial > repos > genjam1

changeset 17:ea345aa9cc30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
using new tile constants
author William Morgan <bill@mrgn.org>
date Sun, 12 Jan 2014 19:02:44 -0800
parents f71eb24b3896
children 60bb690233cf
files src/main.c
diffstat 1 files changed, 14 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.c	Sun Jan 12 18:49:29 2014 -0800
+++ b/src/main.c	Sun Jan 12 19:02:44 2014 -0800
@@ -43,8 +43,8 @@
 
 #define EMPTY 0
 #define WALL 'O' + TILE_FONTINDEX
-#define TOWER 'T' + TILE_FONTINDEX
-#define GOAL 'G' + TILE_FONTINDEX
+#define TOWER TILE_ATTR_FULL(1, 0, 0, 0, 'T' + TILE_FONTINDEX)
+#define GOAL TILE_ATTR_FULL(1, 0, 0, 0, 'G' + TILE_FONTINDEX)
 
 u16 tilemap[40*28];
 u16 countdown;
@@ -77,10 +77,12 @@
 		cursor_x += cursor_width;
 	}
 	if (went_down & BUTTON_A) {
-		tilemap[cursor_x     + (cursor_y    ) * 40] = TILE_ATTR_FULL(1, 0, 0, 0, WALL);
-		tilemap[cursor_x + 1 + (cursor_y    ) * 40] = TILE_ATTR_FULL(1, 0, 0, 0, WALL);
-		tilemap[cursor_x     + (cursor_y + 1) * 40] = TILE_ATTR_FULL(1, 0, 0, 0, WALL);
-		tilemap[cursor_x + 1 + (cursor_y + 1) * 40] = TILE_ATTR_FULL(1, 0, 0, 0, WALL);
+		//u16 type_to_place = EMPTY;
+		u16 type_to_place = WALL;
+		tilemap[cursor_x     + (cursor_y    ) * 40] = type_to_place;
+		tilemap[cursor_x + 1 + (cursor_y    ) * 40] = type_to_place;
+		tilemap[cursor_x     + (cursor_y + 1) * 40] = type_to_place;
+		tilemap[cursor_x + 1 + (cursor_y + 1) * 40] = type_to_place;
 	}
 }
 
@@ -97,14 +99,14 @@
 	for (i = 6; i < 40*28; i += 4)
 		if ((i > 80 || i & 4) && (i < 40*26 || !(i & 4)) && i % 40 < 38)
 		{
-			tilemap[i] = 'O' + TILE_FONTINDEX;
-			tilemap[i+1] = 'O' + TILE_FONTINDEX;
+			tilemap[i] = WALL;
+			tilemap[i+1] = WALL;
 		}
 
-	tilemap[38 + 14*40] = TILE_ATTR_FULL(1, 0, 0, 0, 'G' + TILE_FONTINDEX);
-	tilemap[39 + 14*40] = TILE_ATTR_FULL(1, 0, 0, 0, 'G' + TILE_FONTINDEX);
-	tilemap[38 + 15*40] = TILE_ATTR_FULL(1, 0, 0, 0, 'G' + TILE_FONTINDEX);
-	tilemap[39 + 15*40] = TILE_ATTR_FULL(1, 0, 0, 0, 'G' + TILE_FONTINDEX);
+	tilemap[38 + 14*40] = GOAL;
+	tilemap[39 + 14*40] = GOAL;
+	tilemap[38 + 15*40] = GOAL;
+	tilemap[39 + 15*40] = GOAL;
 	gen_distances(38, 14);
 	for (i = 0; i < MAX_SPRITE; i++)
 	{