p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index c968bdf6a76270d950863cf5c6748fdcc78df0a7..7b97a9af19ff771627eca2938986882903bf69a9 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -84,15 +84,16 @@ void main(int argc, char *argv[])
        //----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
-#ifndef NOMAPLOAD\r
 //     fprintf(stderr, "testing map load~      ");\r
        CA_loadmap("data/test.map", &map, &gvar);\r
+#ifndef NOMAPLOAD\r
        chkmap(&map, 0);\r
 //     initMap(&map);\r
 //     printf("chkmap ok       ");\r
 //     fprintf(stderr, "yay map loaded~~\n");\r
 #else\r
-       initMap(&map);\r
+       chkmap(&map, 1);\r
+       //initMap(&map);\r
 #endif\r
        // data\r
        VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
@@ -107,7 +108,8 @@ void main(int argc, char *argv[])
        modexPalBlack();\r
 #endif\r
 \r
-       VGAmodeX(1/*bakapee*/, 1, &gvar);\r
+       //--VGAmodeX(1/*bakapee*/, 1, &gvar);\r
+       VL_Startup(&gvar);\r
 \r
        /* load color palette */\r
        /*ptmp.offset=(paloffset/3);\r
@@ -117,7 +119,7 @@ void main(int argc, char *argv[])
        //printf("1:    %d\n", paloffset);\r
        map.tiles->data->offset=(paloffset/3);\r
        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
-       VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
+       VL_LoadPalFile(bakapee1p, &gvar.video.palette, &gvar);\r
        //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
 \r
 #ifdef FADE\r
@@ -215,7 +217,7 @@ void main(int argc, char *argv[])
                        }\r
                        //read_vrs(&gvar, bakapee1, gvar.player[0].enti.spri->spritesheet);\r
                        VRS_ReadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
-                       VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
+                       VL_LoadPalFile(bakapee1p, &gvar.video.palette, &gvar);\r
                }//JK\r
 #ifdef FADE\r
                if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }\r