From: sparky4 <sparky4@cock.li>
Date: Tue, 2 Jun 2015 17:42:19 +0000 (-0500)
Subject: ok it works...... but not the graphical library....
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=966ee2742b559bee385144a3414e132fdc73bf18;p=16.git

ok it works...... but not the graphical library....
	modified:   data/g.pal
	modified:   scroll.exe
	modified:   scroll.out
	modified:   src/scroll.c
---

diff --git a/data/g.pal b/data/g.pal
index 1119179f..a234f82c 100644
Binary files a/data/g.pal and b/data/g.pal differ
diff --git a/scroll.exe b/scroll.exe
index 7d31cafa..eedd2c97 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/scroll.out b/scroll.out
index b95a9611..39e4f9ed 100644
--- a/scroll.out
+++ b/scroll.out
@@ -4,9 +4,74 @@ qqqqqqqq
 
 qqqqqqqq
 
+chkcolor start~
+1				(*z): 0
+1				(*i): 39
+wwwwwwwwwwwwwwww
+!!					a[30]: 0
+!!					a[31]: 11
+!!					a[38]: 28
+wwwwwwwwwwwwwwww
+2				(*z): 39
+2				(*i): 39
+chkcolor end~
+p[]=0	qp=90	p[]-qp=90
+p[]=1	qp=90	p[]-qp=91
+p[]=2	qp=90	p[]-qp=92
+		90's color=3
+		91's color=3
+		92's color=3
+
+qqqqqqqq
+
+p[]=0	qp=93	p[]-qp=93
+p[]=1	qp=93	p[]-qp=94
+p[]=2	qp=93	p[]-qp=95
+p[]=3	qp=93	p[]-qp=96
+p[]=4	qp=93	p[]-qp=97
+p[]=5	qp=93	p[]-qp=98
+		93's color=39
+		94's color=39
+		95's color=39
+
+qqqqqqqq
+
+p[]=0	qp=114	p[]-qp=114
+p[]=1	qp=114	p[]-qp=115
+p[]=2	qp=114	p[]-qp=116
+p[]=3	qp=114	p[]-qp=117
+p[]=4	qp=114	p[]-qp=118
+p[]=5	qp=114	p[]-qp=119
+p[]=6	qp=114	p[]-qp=120
+p[]=7	qp=114	p[]-qp=121
+p[]=8	qp=114	p[]-qp=122
+p[]=9	qp=114	p[]-qp=123
+p[]=10	qp=114	p[]-qp=124
+p[]=11	qp=114	p[]-qp=125
+p[]=12	qp=114	p[]-qp=126
+p[]=13	qp=114	p[]-qp=127
+p[]=14	qp=114	p[]-qp=128
+p[]=15	qp=114	p[]-qp=129
+p[]=16	qp=114	p[]-qp=130
+p[]=17	qp=114	p[]-qp=131
+p[]=18	qp=114	p[]-qp=132
+p[]=19	qp=114	p[]-qp=133
+p[]=20	qp=114	p[]-qp=134
+p[]=21	qp=114	p[]-qp=135
+p[]=22	qp=114	p[]-qp=136
+p[]=23	qp=114	p[]-qp=137
+p[]=24	qp=114	p[]-qp=138
+p[]=25	qp=114	p[]-qp=139
+p[]=26	qp=114	p[]-qp=140
+		114's color=111
+		115's color=111
+		116's color=111
+
+qqqqqqqq
+
 
 ====
-0	paloffset=	10
+0	paloffset=	38
 ====
 
 i=1
@@ -661,9 +726,9 @@ player.tx: 10		player.ty: 8
 player.triggx: 10	player.triggy: 9
 player.hp: 4	player.q: 1	player.d: 0
 tile data value at player trigger position: 0
-palette offset:	10
-Total used: 32328
-Total free: 25816
+palette offset:	38
+Total used: 51566
+Total free: 6562
 temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867
 temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385
 Screen: 352x280
diff --git a/src/scroll.c b/src/scroll.c
index 93cc5d96..70875da1 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,31 +1,11 @@
 #include "src/lib/dos_kb.h"
 #include "src/lib/mapread.h"
-//#include "16\lib\x\modex.h"
 #include "src/lib/wtest/wtest.c"
 #include "src/lib/planar.c"
 //====#include "src\lib\ems.c"
 
-//#define LOADDATA
-
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 
-/*typedef struct {
-	bitmap_t *data;
-	word tileHeight;
-	word tileWidth;
-	unsigned int rows;
-	unsigned int cols;
-} tiles_t;
-
-
-typedef struct {
-	byte	*data;
-	tiles_t *tiles;
-	int width;
-	int height;
-} map_t;*/
-
-
 typedef struct {
 	map_t *map;
 	page_t *page;
@@ -72,8 +52,8 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 //place holder definitions
 //#define MAPX 200
 //#define MAPY 150
-#define TRIGGX 10
-#define TRIGGY 9
+//#define TRIGGX 10
+//#define TRIGGY 9
 
 void main() {
 	size_t oldfreemem=GetFreeSize();
@@ -126,11 +106,9 @@ void main() {
 
 	/* create the map */
 //0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
-//0000	#ifdef LOADDATA
 //0000	fprintf(stderr, "testing~\n");
 	loadmap("data/test.map", &map);
 //0000	fprintf(stderr, "yay map loaded~~\n");
-//0000	#endif
 //----	map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
 	//if(isEMS()) printf("%d tesuto\n", coretotalEMS());
 //----	initMap(&map);
@@ -143,16 +121,12 @@ void main() {
 	mappalptr = map.tiles->data->palette;
 	/* data */
 //0000	printf("Total used @ before image loading:		%zu\n", oldfreemem-GetFreeSize());
-#ifdef LOADDATA
 	ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
-#endif
 	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 	
 	/* create the planar buffer */
 //0000	printf("Total used @ before planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
-#ifdef LOADDATA
 	p = planar_buf_from_bitmap(&ptmp);
-#endif
 //0000	printf("Total used @ after planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
 
 	/*if(isEMS())