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

[proj16/16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index fcc7778..1b42f8f 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -26,6 +26,7 @@
 #include "src/lib/16_dbg.h"\r
 \r
 #define FADE\r
+//#define NOMAPLOAD\r
 \r
 //map_view_t mv[4];\r
 static map_t map;\r
@@ -51,26 +52,31 @@ memptr pal;
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       char *bakapee1,*bakapee1p;\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
+       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
+//     bakapee1=mALLoc(64);\r
+//     bakapee1p=mALLoc(64);\r
        ggvv=&gvar;\r
 \r
-       if (argc < 2) {\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[2]) bakapee1p = argv[2];*/\r
+               if(argv[1]){ strcpy(bakapee1, argv[1]);\r
+               if(argv[2]) strcpy(bakapee1p, argv[2]); }\r
        }\r
 \r
        // OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
@@ -80,11 +86,15 @@ void main(int argc, char *argv[])
        // create the map\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
-\r
+#else\r
+       chkmap(&map, 1);\r
+       //initMap(&map);\r
+#endif\r
        // data\r
        VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
 \r
@@ -133,7 +143,7 @@ void main(int argc, char *argv[])
 #ifdef FADE\r
                modexFadeOff(4, &gvar.video.palette);\r
 #endif\r
-               Quit(&gvar, "Wrong ID for sprite");\r
+               Quit (&gvar, "Wrong ID for sprite");\r
 #ifdef FADE\r
                modexFadeOn(4, &gvar.video.dpal);\r
 #endif\r
@@ -180,8 +190,8 @@ void main(int argc, char *argv[])
                if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }\r
                //debugging binds!\r
 \r
-               if(gvar.in.inst->Keyboard[24]){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o\r
-               if(gvar.in.inst->Keyboard[22]){ modexPalUpdate0(&gvar.video.palette); } //u\r
+               if(gvar.in.inst->Keyboard[24]){ VL_modexPalScramble(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o\r
+               if(gvar.in.inst->Keyboard[22]){ VL_modexPalScramble(&gvar.video.palette); } //u\r
 \r
                TAIL_FUNCTIONKEYFUNCTIONS\r
                TAIL_FUNCTIONKEYDRAWJUNK\r
@@ -190,14 +200,18 @@ void main(int argc, char *argv[])
                {\r
                        if(gvar.in.inst->Keyboard[sc_J])\r
                        {\r
-                               bakapee1=FILENAME_1;\r
-                               bakapee1p=FILENAME_1P;\r
+//                             bakapee1=FILENAME_1;\r
+//                             bakapee1p=FILENAME_1P;\r
+                               strcpy(bakapee1, FILENAME_1);\r
+                               strcpy(bakapee1p, FILENAME_1P);\r
                                gvar.player[0].enti.overdraww=0;\r
                        }\r
                        if(gvar.in.inst->Keyboard[sc_K])\r
                        {\r
-                               bakapee1=FILENAME_2;\r
-                               bakapee1p=FILENAME_2P;\r
+//                             bakapee1=FILENAME_2;\r
+//                             bakapee1p=FILENAME_2P;\r
+                               strcpy(bakapee1, FILENAME_2);\r
+                               strcpy(bakapee1p, FILENAME_2P);\r
                                gvar.player[0].enti.overdraww=2;\r
                        }\r
                        //read_vrs(&gvar, bakapee1, gvar.player[0].enti.spri->spritesheet);\r
@@ -209,7 +223,7 @@ void main(int argc, char *argv[])
 #endif\r
                if(gvar.in.inst->Keyboard[sc_R]){ modexPalOverscan(rand()%56); } //r\r
 \r
-               if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break;   //incase things go out of sync!\r
+               if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit (&gvar, "PLAYER OFF THE RAILS!");//break;  //incase things go out of sync!\r
        }\r
 \r
        /* fade back to text mode */\r