==== OK i removed all warnings wwww

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index 12680234717ff018c78c5b5a6492f27c778847be..d2786c16357f4f0a1efce6b4889d1ec0c17cdde8 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -23,6 +23,7 @@
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/wcpu.h"\r
+#include "src/lib/16render.h"\r
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 //bitmap_t *p;\r
@@ -35,7 +36,7 @@ float t;
 sword bakapee;\r
 pan_t pan;\r
 //debugswitches\r
-boolean panswitch=0;\r
+boolean panswitch=0,baka=0;\r
 //extern boolean pageflipflop=1;\r
        unsigned int i;\r
        const char *cpus;\r
@@ -53,8 +54,6 @@ boolean panswitch=0;
 \r
 void main(int argc, char *argv[])\r
 {\r
-       byte *mesg=malloc(sizeof(dword));\r
-\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
@@ -74,8 +73,7 @@ void main(int argc, char *argv[])
        //mappalptr = map.tiles->btdata->palette;\r
 \r
        /* data */\r
-       player[0].data = malloc(48*128); //TODO use exmm\r
-       *player[0].data = bitmapLoadPcx("data/chikyuu.pcx"); // load sprite\r
+       if(CA_LoadFile("data/spri/chikyuu.vrs", &(player[0].gr), &gvar)) baka=1; else baka=0;\r
 \r
        /* create the planar buffer */\r
 ////++++       (player[0].data) = *planar_buf_from_bitmap(&p);\r