X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=retrocrawl;a=blobdiff_plain;f=src%2Fgame.c;fp=src%2Fgame.c;h=97c1895be7f7647790e37fbbba43332d541b3a0b;hp=a4dc4c70067e142ae6a54c94db54a7f3068600f0;hb=87c45ef8c82a3925719cbf2024e5932208b244ce;hpb=bba694e9bc50fb24ffe4b3c8f7b5d33f01b3ea4d

diff --git a/src/game.c b/src/game.c
index a4dc4c7..97c1895 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,40 +1,54 @@
 #include <string.h>
 #include "game.h"
-#include "data_test.h"
 #include "gfx.h"
+#include "data.h"
 
 #include "hwregs.h"	/* XXX */
 
-#define TILE_W	32
-#define TILE_H	16
+#define TILE_W	64
+#define TILE_H	32
 
 void draw_tile(int tid, int x, int y, int light);
-void convert_tile_data(unsigned char *dest, const char *src);
 
-static unsigned char test_tiles[2][TILE_W * TILE_H / 8 * NBPL];
-static unsigned char tile_mask[TILE_W * TILE_H / 8 * NBPL];
 
 int game_init(void)
 {
-	int i;
+	REG_COLOR0 = 0x221;
+	REG_COLOR1 = 0x222;
+	REG_COLOR2 = 0x332;
+	REG_COLOR3 = 0x433;
+	REG_COLOR4 = 0x543;
+	REG_COLOR5 = 0x554;
+	REG_COLOR6 = 0x654;
+	REG_COLOR7 = 0x765;
 
-	for(i=0; i<2; i++) {
-		convert_tile_data(test_tiles[i], test_tiles_cpix[i][0]);
-	}
-	convert_tile_data(tile_mask, tile_mask_cpix[0]);
 	return 0;
 }
 
+#define XTILES	5
+#define YTILES	13
+
 void game_draw(void)
 {
-	draw_tile(0, 32, 16, 0);
+	int i, j, xoffs, yoffs, ntiles;
+
+	yoffs = 0;
+	for(i=0; i<YTILES; i++) {
+		xoffs = i & 1 ? TILE_W / 2 : 0;
+		ntiles = i & 1 ? XTILES - 1 : XTILES;
+		for(j=0; j<ntiles; j++) {
+			draw_tile(0, xoffs, yoffs, 0);
+			xoffs += TILE_W;
+		}
+		yoffs += TILE_H / 2;
+	}
 }
 
 
 void draw_tile(int tid, int x, int y, int light)
 {
 	unsigned char *dest = bplptr[0] + (y * SCANSZ * NBPL) + x / 8;
-	unsigned char *src = test_tiles[tid];
+	unsigned char *src = test_tile;
 
 	wait_blit();
 
@@ -45,60 +59,9 @@ void draw_tile(int tid, int x, int y, int light)
 	REG_BLTBMOD = 0;
 	REG_BLTCMOD = SCANSZ - TILE_W / 8;
 	REG_BLTDMOD = SCANSZ - TILE_W / 8;
-	REG32_BLTAPT = (intptr_t)tile_mask;
+	REG32_BLTAPT = (intptr_t)test_tile_mask;
 	REG32_BLTBPT = (intptr_t)src;
 	REG32_BLTCPT = (intptr_t)dest;
 	REG32_BLTDPT = (intptr_t)dest;
 	REG_BLTSIZE = BLTSIZE(TILE_W, TILE_H * NBPL);
 }
-
-static inline int charpix_color(char c)
-{
-	switch(c) {
-	case '0':
-		return 0;
-	case '#':
-		return 1;
-	case 'x':
-		return 2;
-	case '@':
-		return 3;
-	case 'o':
-		return 4;
-	case '.':
-		return 0x1f;
-	default:
-		break;
-	}
-	return 0;
-}
-
-#define TILE_SCANSZ	(TILE_W / 8)
-void convert_tile_data(unsigned char *dest, const char *src)
-{
-	int i, j, k;
-	unsigned char *bptr[NBPL];
-
-	for(i=0; i<NBPL; i++) {
-		bptr[i] = dest + TILE_SCANSZ * i;
-	}
-
-	for(i=0; i<TILE_H; i++) {
-		for(j=0; j<TILE_W; j++) {
-			int col = charpix_color(*src++);
-
-			for(k=0; k<NBPL; k++) {
-				*bptr[k] = (*bptr[k] << 1) | (col & 1);
-				col >>= 1;
-
-				if((j & 7) == 7) {
-					bptr[k]++;
-				}
-			}
-		}
-
-		for(j=0; j<NBPL; j++) {
-			bptr[j] += TILE_SCANSZ * (NBPL - 1);
-		}
-	}
-}