Mercurial > repos > genjam1
changeset 18:60bb690233cf
merge
| author | William Morgan <bill@mrgn.org> |
|---|---|
| date | Sun, 12 Jan 2014 19:11:54 -0800 |
| parents | ea345aa9cc30 (diff) a9500e8bff93 (current diff) |
| children | 08f2bcf3447f |
| files | src/main.c |
| diffstat | 1 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c Sun Jan 12 19:01:30 2014 -0800 +++ b/src/main.c Sun Jan 12 19:11:54 2014 -0800 @@ -43,8 +43,8 @@ #define EMPTY 0 #define WALL 'O'-32 + TILE_FONTINDEX -#define TOWER 'T'-32 + TILE_FONTINDEX -#define GOAL 'G'-32 + TILE_FONTINDEX +#define TOWER TILE_ATTR_FULL(1, 0, 0, 0, 'T'-32 + TILE_FONTINDEX) +#define GOAL TILE_ATTR_FULL(1, 0, 0, 0, 'G'-32 + TILE_FONTINDEX) u16 tilemap[40*28]; u16 countdown; @@ -78,10 +78,12 @@ cursor_x += cursor_width; } if (went_down & BUTTON_A && !running) { - 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; gen_distances(38, 14); if (distances[122/16] == 0xFFFF) { @@ -110,15 +112,15 @@ /*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, GOAL); - tilemap[39 + 14*40] = TILE_ATTR_FULL(1, 0, 0, 0, GOAL); - tilemap[38 + 15*40] = TILE_ATTR_FULL(1, 0, 0, 0, GOAL); - tilemap[39 + 15*40] = TILE_ATTR_FULL(1, 0, 0, 0, GOAL); + tilemap[38 + 14*40] = GOAL; + tilemap[39 + 14*40] = GOAL; + tilemap[38 + 15*40] = GOAL; + tilemap[39 + 15*40] = GOAL; for (i = 0; i < MAX_SPRITE; i++) { spriteDefCache[i].posx = -0x80;