OSDN Git Service

wwww broke zcroll to make it use vrs wwww
authorsparky4 <sparky4@cock.li>
Thu, 13 Oct 2016 17:16:14 +0000 (12:16 -0500)
committersparky4 <sparky4@cock.li>
Thu, 13 Oct 2016 17:16:14 +0000 (12:16 -0500)
data/g.pal
src/lib/16_in.h
src/zcroll.c

index 0ecbac3..f3ba115 100755 (executable)
Binary files a/data/g.pal and b/data/g.pal differ
index 5b07853..29ecc13 100755 (executable)
@@ -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
index 1268023..3162336 100755 (executable)
@@ -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