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

diff --git a/src/16.c b/src/16.c
index 6ad5334f03d1566a7554375400166e9ee337a7e0..5dcd6d31fcfed5ffdf5c93eea181ee8666235ee6 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -22,7 +22,6 @@
 \r
 #include "src/16.h"\r
 \r
-global_game_variables_t gvar;\r
 engi_stat_t engi_stat;\r
 const char *cpus;\r
 byte *dpal, *gpal;\r
@@ -31,6 +30,7 @@ player_t player[MaxPlayers];
 void\r
 main(int argc, char *argv[])\r
 {\r
+       static global_game_variables_t gvar;\r
        // DOSLIB: check our environment\r
        probe_dos();\r
 \r

diff --git a/src/bakapi.c b/src/bakapi.c
index 00fc689f94c1be2db7d25c24bcad660cb87149b9..381badd1c4e0c2c223d52379849e0c83d39d9738 100755 (executable)
--- a/src/bakapi.c
+++ b/src/bakapi.c
@@ -25,7 +25,6 @@
 /*\r
  * BAKAPEE!\r
  */\r
-global_game_variables_t gvar;\r
 static bakapee_t bakapee;\r
 word key,d,xpos,ypos,xdir,ydir;\r
 sword vgamodex_mode = 1; // 320x240 default\r
@@ -34,6 +33,7 @@ int ch=0x0;
 void\r
 main(int argc, char *argvar[])\r
 {\r
+       static global_game_variables_t gvar;\r
        char *a;\r
        int i;\r
        word panq=1, pand=0;\r

diff --git a/src/fontgfx.c b/src/fontgfx.c
index e25a130a07f1e0c22e46559f4af06dcf1af91ca9..90d0efc4c1bf566e61a84b259e208fd11af4ea3d 100755 (executable)
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -29,10 +29,9 @@
 #include <hw/dos/dos.h>\r
 #include <hw/vga/vga.h>\r
 \r
-global_game_variables_t gvar;\r
-\r
 void main(int argc, char near *argv[])\r
 {\r
+       static global_game_variables_t gvar;\r
        //JMOJI\r
        static byte e;\r
        //word ri;\r

diff --git a/src/inputest.c b/src/inputest.c
index e45c813d3dd2121154124e9306db59c27e7d0d1d..c9c27dd91254b432aca21e62deedbdaf61314d88 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -28,7 +28,7 @@
 void\r
 main(int argc, char *argv[])\r
 {\r
-       global_game_variables_t gvar;\r
+       static global_game_variables_t gvar;\r
        player_t player[MaxPlayers];\r
        //extern struct inconfig inpu;\r
        dbg_testkeyin=0;\r

diff --git a/src/palettec.c b/src/palettec.c
index 624b098f4fa01fe8956eede176b5e4671f563dc4..df89b454988932b708658d60d8a6074f8a9bff43 100755 (executable)
--- a/src/palettec.c
+++ b/src/palettec.c
@@ -22,11 +22,10 @@
 \r
 #include "src/lib/16_vl.h"\r
 \r
-global_game_variables_t gvar;\r
-\r
 void\r
 main(int argc, char *argv[])\r
 {\r
+       static global_game_variables_t gvar;\r
        byte *pal;\r
        byte *bakapee;\r
 \r

diff --git a/src/palettel.c b/src/palettel.c
index 53e86c2d0c19409b80524eac9be4069c1ae31a83..6ec55683ca3abd40c8db0ac30984f47456c2e92d 100755 (executable)
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -23,7 +23,6 @@
 #include "src/lib/16_vl.h"\r
 #include "src/lib/bakapee.h"\r
 \r
-global_game_variables_t gvar;\r
 byte *pal;\r
 char *bakapee;\r
 word i;\r
@@ -31,6 +30,7 @@ word i;
 void\r
 main(int argc, char *argv[])\r
 {\r
+       static global_game_variables_t gvar;\r
        //page.width += 32;\r
        //page.height += 32;\r
        pal = modexNewPal();\r

diff --git a/src/pcxtest.c b/src/pcxtest.c
index 84a8323699855b657c370a37a64cbd96939d91a3..5325303c9bd6c4b1a749018136cee484105ed62e 100755 (executable)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -27,10 +27,10 @@
 #include "src/lib/bitmap.h"\r
 //----#include "src/lib/planar.h"\r
 \r
-global_game_variables_t gvar;\r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
 void main() {\r
+       static global_game_variables_t gvar;\r
        bitmap_t bmp;\r
 //---- planar_buf_t *p;\r
        int i;\r

diff --git a/src/pcxtest2.c b/src/pcxtest2.c
index f92c300be87c7871db32ff7404e4b0312bf4530e..c65f4e9411a73068f87d59e9ba59d14f0405ead0 100755 (executable)
--- a/src/pcxtest2.c
+++ b/src/pcxtest2.c
@@ -27,7 +27,6 @@
 #include "src/lib/bitmap.h"\r
 //----#include "src/lib/planar.h"\r
 \r
-global_game_variables_t gvar;\r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
 /*\r
@@ -56,6 +55,7 @@ DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
 */\r
 \r
 void main() {\r
+       static global_game_variables_t gvar;\r
        bitmap_t bmp;\r
 //---- planar_buf_t *p;\r
        int i;\r

diff --git a/src/scroll.c b/src/scroll.c
index 5beb4743d33660ce11b0aec8ac039d03ff131010..4b65b55375171e460a0acd810a655a273a83973c 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -31,7 +31,6 @@
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 //bitmap_t *p;\r
-global_game_variables_t gvar;\r
 static map_t map;\r
 player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
@@ -58,6 +57,7 @@ boolean panswitch=0;//1
 \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

diff --git a/src/test.c b/src/test.c
index a2268d373af3cdd6366beaeceb773817359be3c0..fe7b401fa4f566cf807b5a677934d70f530b9967 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -27,13 +27,13 @@
 #include "src/lib/bakapee.h"\r
 \r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
-global_game_variables_t gvar;\r
 player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
 pan_t pan;\r
 \r
 void main(int argc, char *argv[])\r
 {\r
+       static global_game_variables_t gvar;\r
        int i, j;\r
        word startclk, endclk;\r
        word k;\r

diff --git a/src/vgacamm.c b/src/vgacamm.c
index 2c8eaa89a5698d38df9629d8bf82541c84bb9b8d..3c856f30f7a50605a94e6f15601b2fb76809dc1a 100755 (executable)
--- a/src/vgacamm.c
+++ b/src/vgacamm.c
@@ -28,7 +28,7 @@
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
 void main() {\r
-       global_game_variables_t gvar;\r
+       static global_game_variables_t gvar;\r
        __segment sega;\r
        memptr bigbuffer;\r
        int i;\r

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