no idea why bcexmm.exe is broke w tweaked zcroll.exe a bit also Quit is refined now...

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index a28522d71f4ded0c85f7d199ef5412fd13af310c..65300e9178f0e33983026666fe1272593f2fa9d7 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -29,7 +29,6 @@
 #define MODEXZ\r
 \r
 //TODO: known issues the array dependent mv stuff and player arrays\r
-global_game_variables_t gvar;\r
 static map_t map;\r
 player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
@@ -55,6 +54,7 @@ memptr pal;
 \r
 void main(int argc, char *argv[])\r
 {\r
+       static global_game_variables_t gvar;\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
@@ -88,9 +88,6 @@ void main(int argc, char *argv[])
 #endif\r
        textInit();\r
        VGAmodeX(bakapee, 1, &gvar);\r
-       //strcpy(global_temp_status_text, "press enter for video setup\nescape to quit");\r
-       //modexprint(&gvar.video.page[0], 64, 64, 1, 7, 0, global_temp_status_text);\r
-       //while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww\r
 #ifdef MODEXZ\r
 #ifdef FADE\r
        modexPalBlack();        //reset the palette~\r
@@ -103,9 +100,6 @@ void main(int argc, char *argv[])
 #endif\r
 \r
        // setup camera and screen~\r
-       strcpy(global_temp_status_text, "press enter for page setup\nescape to quit");\r
-       modexprint(&gvar.video.page[0], 64, 64, 1, 7, 0, global_temp_status_text);\r
-       while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww\r
        modexHiganbanaPageSetup(&gvar.video);\r
        for(i=0;i<gvar.video.num_of_pages;i++)\r
        {\r
@@ -116,15 +110,9 @@ void main(int argc, char *argv[])
        }\r
        player[0].ent->spri->x = player[0].ent->spri->y = 20;\r
 \r
-       strcpy(global_temp_status_text, "press enter for mapGoTo setup\nescape to quit");\r
-       modexprint(mv[0].page/*&gvar.video.page[0]*/, 64, 64, 1, 7, 0, global_temp_status_text);\r
-       while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww\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(mv, 0, 0);\r
-       strcpy(global_temp_status_text, "press enter for final initiation setup\nescape to quit");\r
-       modexprint(&gvar.video.page[0], 64, 64, 1, 7, 0, global_temp_status_text);\r
-       while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww\r
 #endif\r
 \r
        //TODO: put player in starting position of spot\r
@@ -140,21 +128,22 @@ void main(int argc, char *argv[])
 #ifdef FADE\r
                modexFadeOff(4, gpal);\r
 #endif\r
-       VGAmodeX(0, 1, &gvar);\r
-       Shutdown16(&gvar);\r
-       printf("Wrong");\r
+               Quit(&gvar, "Wrong");\r
 #ifdef FADE\r
                modexFadeOn(4, dpal);\r
 #endif\r
        exit(-4);\r
        }\r
-       //animate_spri(&(player[0].ent->spri));\r
+       //++++animate_spri(&(player[0].ent->spri));\r
 \r
        modexShowPage(mv[0].page);//!(gvar.video.p)\r
        shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.\r
 #ifdef FADE\r
        modexFadeOn(4, gpal);\r
 #endif\r
+       strcpy(global_temp_status_text, "press enter for the loop of zcroll\nescape to quit");\r
+       modexprint(&gvar.video.page[0], 144, 72, 1, 7, 0, global_temp_status_text);\r
+       while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww\r
        while(!IN_KeyDown(sc_Escape))// && player[0].hp>0)\r
        {\r
                shinku(&gvar);\r