X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fzcroll.c;h=d2786c16357f4f0a1efce6b4889d1ec0c17cdde8;hb=fb900d77df687bfa549995e15a762017c381e552;hp=12680234717ff018c78c5b5a6492f27c778847be;hpb=8963bebd882f1b215d823a0b1d8fa04da986cdf1;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index 12680234..d2786c16 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -23,6 +23,7 @@
 #include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
+#include "src/lib/16render.h"
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 //bitmap_t *p;
@@ -35,7 +36,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;
@@ -53,8 +54,6 @@ boolean panswitch=0;
 
 void main(int argc, char *argv[])
 {
-	byte *mesg=malloc(sizeof(dword));
-
 	if(argv[1]) bakapee = atoi(argv[1]);
 	else bakapee = 1;
 
@@ -74,8 +73,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);