16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index c968bdf6a76270d950863cf5c6748fdcc78df0a7..ed02457e7c28ab78389fae4c56f4e2d421813d37 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,7 +22,6 @@
 \r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-#include "src/lib/16render.h"\r
 #include "src/lib/16_dbg.h"\r
 \r
 #define FADE\r
@@ -52,29 +51,15 @@ memptr pal;
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       struct glob_game_vars   *ggvv;\r
-//     sword bakapee;\r
-//     if(argv[1]) bakapee = atoi(argv[1]);\r
-//     else bakapee = 1;\r
-       //char *bakapee1,*bakapee1p;\r
+       struct glob_game_vars *ggvv;\r
        char bakapee1[64] = FILENAME_1;\r
        char bakapee1p[64] = FILENAME_1P;\r
 \r
        Startup16(&gvar);\r
 \r
-//     bakapee1=mALLoc(64);\r
-//     bakapee1p=mALLoc(64);\r
        ggvv=&gvar;\r
 \r
        if (argc >= 2) {\r
-/*     if (argc < 2) {\r
-               //fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");\r
-               bakapee1 =              FILENAME_1;\r
-               bakapee1p =     FILENAME_1P;\r
-\r
-       }else{\r
-               if(argv[1]) bakapee1 = argv[1];\r
-               if(argv[2]) bakapee1p = argv[2];*/\r
                if(argv[1]){ strcpy(bakapee1, argv[1]);\r
                if(argv[2]) strcpy(bakapee1p, argv[2]); }\r
        }\r
@@ -84,15 +69,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 +93,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,19 +104,30 @@ 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
        modexPalSave(&gvar.video.palette);\r
        modexSavePalFile("data/g.pal", &gvar.video.palette);\r
-       modexPalBlack();        //so gvar.player will not see loadings~\r
+       modexPalBlack();        //so player will not see loadings~\r
 #endif\r
 \r
        // setup camera and screen~\r
-       modexHiganbanaPageSetup(&gvar.video);\r
+       modexHiganbanaPageSetup(&gvar);\r
        ZC_MVSetup(&gvar.mv, &map, &gvar);\r
 \r
+#ifdef FADE\r
+       modexFadeOn(4, &gvar.video.palette);\r
+#endif\r
+\r
+       IN_StartAck (&gvar);\r
+       MM_ShowMemory(&gvar);\r
+       while (!IN_CheckAck (&gvar)){}\r
+#ifdef FADE\r
+       modexPalBlack();        //so player will not see loadings~\r
+#endif\r
+\r
        // set up paging\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
        mapGoTo(&gvar.mv, 0, 0);\r
@@ -151,6 +149,7 @@ void main(int argc, char *argv[])
 //     while(!gvar.in.inst->Keyboard[sc_Escape) && !gvar.in.inst->Keyboard[sc_Space) && !gvar.in.inst->Keyboard[sc_Enter]){ FUNCTIONKEYSHOWMV }\r
        gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
        gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
+\r
        shinku(&gvar);\r
 //modexpdump(gvar.mv[0].page);\r
 #ifdef FADE\r
@@ -215,7 +214,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