From: sparky4 <sparky4@cock.li>
Date: Tue, 3 Nov 2015 19:14:45 +0000 (-0600)
Subject: updateing
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=ce32295240ab24871bc4ba190e7b9351b464dc31;p=16.git

updateing
---

diff --git a/16.exe b/16.exe
index 2cfa243e..b586178f 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 494d15e6..0aab5d97 100755
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/maptest.exe b/maptest.exe
index 392d02c7..3b6dd5f3 100755
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/planrpcx.exe b/planrpcx.exe
index 7276d5bc..3e772ef0 100755
Binary files a/planrpcx.exe and b/planrpcx.exe differ
diff --git a/scroll.exe b/scroll.exe
index a8c8ab9f..f8c4bd71 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 9bfdf6c9..7713597a 100755
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -13,6 +13,7 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
 	dword i;
 	word j;//, k;
 	bitmap_t bp;
+	planar_buf_t bpp;
 	#ifdef DEBUG_JS
 	if(indent==0)
 	{
@@ -71,10 +72,14 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
 //			fprintf(stdout, "\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size);
 			map->data = malloc(sizeof(byte) * (t+1)->size);
 			map->tiles = malloc(sizeof(tiles_t));
-			//map->tiles->data = malloc(sizeof(bitmap_t));
+			map->tiles->btdata = malloc(sizeof(bitmap_t));
+			map->tiles->btdata = malloc(sizeof(bitmap_t));
 			//fix this to be far~
 			bp = bitmapLoadPcx("data/ed.pcx");
-			map->tiles->data = planar_buf_from_bitmap0(&bp);
+			bpp = planar_buf_from_bitmap0(&bp);
+			map->tiles->btdata = &bp;
+			//0000++++map->tiles->data = planar_buf_from_bitmap0(&bp);
+			map->tiles->data = bpp;
 			//map->tiles->data->data = malloc((16/**2*/)*16);
 			//map->tiles->data->width = (16/**2*/);
 			//map->tiles->data->height= 16;
diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index 3f9e3ac6..0cda1073 100755
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -16,8 +16,7 @@
 //#define DEBUG_JS
 
 typedef struct {
-//----	bitmap_t huge *btdata;
-	//planar_buf_t huge *data;
+	bitmap_t huge *btdata;
 	planar_buf_t data;
 	word tileHeight;
 	word tileWidth;
diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 93936157..156f2e5c 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -34,7 +34,7 @@
 #include "src/lib/wcpu/wcpu.h"
 
 //#define SPRITE
-#define TILERENDER
+//#define TILERENDER
 
 #define PBUFSFUN		modexDrawSpritePBufRegion
 #define PBUFBFUN		modexDrawBmpPBufRegion
diff --git a/test.exe b/test.exe
index f33b73c5..65f1a7aa 100755
Binary files a/test.exe and b/test.exe differ