From: sparky4 <sparky4@cock.li>
Date: Thu, 13 Oct 2016 17:16:14 +0000 (-0500)
Subject: wwww broke zcroll to make it use vrs wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=fb7a829ac8792e92f373405b1f23da29aab627e8;p=16.git

wwww broke zcroll to make it use vrs wwww
---

diff --git a/data/g.pal b/data/g.pal
index 0ecbac33..f3ba115f 100755
Binary files a/data/g.pal and b/data/g.pal differ
diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 5b078536..29ecc130 100755
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -226,7 +226,8 @@ typedef	struct
 //	planar_buf_t data; //supposively the sprite sheet data
 ////0000----
 #ifdef	__WATCOMC__
-	struct sprite *spri;	//supposively the sprite sheet data
+	struct sprite	*spri;	//supposively the sprite sheet data
+	memptr		gr;
 #endif
 	bitmap_t *data;		//supposively the sprite sheet data//old format
 	sword hp; //hitpoints of the player
diff --git a/src/zcroll.c b/src/zcroll.c
index 12680234..31623367 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -35,7 +35,7 @@ float t;
 sword bakapee;
 pan_t pan;
 //debugswitches
-boolean panswitch=0;
+boolean panswitch=0,baka=0;
 //extern boolean pageflipflop=1;
 	unsigned int i;
 	const char *cpus;
@@ -74,8 +74,7 @@ void main(int argc, char *argv[])
 	//mappalptr = map.tiles->btdata->palette;
 
 	/* data */
-	player[0].data = malloc(48*128); //TODO use exmm
-	*player[0].data = bitmapLoadPcx("data/chikyuu.pcx"); // load sprite
+	if(CA_LoadFile("data/spri/chikyuu.vrs", &(player[0].gr), &gvar)) baka=1; else baka=0;
 
 	/* create the planar buffer */
 ////++++	(player[0].data) = *planar_buf_from_bitmap(&p);