wwww broke zcroll to make it use vrs wwww

diff --git a/data/g.pal b/data/g.pal
index 0ecbac33f44529d9701eae8c9b262c7da0f50416..f3ba115f905bf4de116f6d5abba16122eec13691 100755 (executable)
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 5b07853635c6a28924f61c9259f8305ea74a89df..29ecc130e1f91616bf870bd9f88a895c6ea30f90 100755 (executable)
--- 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\r
 ////0000----\r
 #ifdef __WATCOMC__\r
-       struct sprite *spri;    //supposively the sprite sheet data\r
+       struct sprite   *spri;  //supposively the sprite sheet data\r
+       memptr          gr;\r
 #endif\r
        bitmap_t *data;         //supposively the sprite sheet data//old format\r
        sword hp; //hitpoints of the player\r

diff --git a/src/zcroll.c b/src/zcroll.c
index 12680234717ff018c78c5b5a6492f27c778847be..3162336759841b37722be8febc8497033898c6a3 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -35,7 +35,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
@@ -74,8 +74,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