initiaded zcroll.exe

diff --git a/makefile b/makefile
index 3c88097d80060a1e920b7f7f17b08c38353e59a2..0dcb26d6fc2a5bfe4939efaba17cad9726fc6eac 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -166,7 +166,7 @@ TESTEXEC = &
     fonttest.exe &
     fontgfx.exe &
     scroll.exe &
-#zcroll.c &
+    zcroll.exe &
     vgmtest.exe &
     inputest.exe &
     palettel.exe &

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 47ef9b7b78207d90545db3c51d5d84043b386041..f63dddc1dde608f0d07bf45ffe69b3612279952b 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -58,6 +58,14 @@ void Startup16(global_game_variables_t *gvar)
                printf("This program requires VGA or higher graphics hardware\n");\r
                return;\r
        }\r
+\r
+       if (_DEBUG_INIT() == 0) {\r
+#ifdef DEBUGSERIAL\r
+               printf("WARNING: Failed to initialize DEBUG output\n");\r
+#endif\r
+       }\r
+       _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log\r
+       _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r
 #endif\r
        gvar->mm.mmstarted=0;\r
        gvar->pm.PMStarted=0;\r
@@ -66,6 +74,10 @@ void Startup16(global_game_variables_t *gvar)
        PM_Startup(gvar);\r
        PM_UnlockMainMem(gvar);\r
        CA_Startup(gvar);\r
+#ifdef __WATCOMC__\r
+       start_timer(gvar);\r
+       \r
+#endif\r
 \r
 }\r
 \r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index aadfeaf0cabb3e944ca460de3c4c8f1ce67668f5..d9d37b1632e768a72cf4c1d9f81b9033e6a66518 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -32,6 +32,8 @@
 extern boolean dbg_debugpm;\r
 \r
 void DebugMemory_(global_game_variables_t *gvar, boolean q);\r
+void Shutdown16(global_game_variables_t *gvar);\r
+void Startup16(global_game_variables_t *gvar);\r
 #ifdef __WATCOMC__\r
 void Quit (char *error);\r
 #endif\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 9602732d38d79e6c9660ff649ce494011a7e1dae..1f60967087e3bcb74d3a56b1aa192096f835868a 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -31,6 +31,7 @@
 #include "src/lib/mapread.h" //map is loaded here www\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/wcpu.h"\r
+#include "src/lib/16_tail.h"\r
 \r
 #include <hw/cpu/cpu.h>\r
 #include <hw/dos/dos.h>\r

diff --git a/src/zcroll.c b/src/zcroll.c
index d3912145c3d5a81096f2fb2fa91adeaadbfee136..02d0e47f1d34dbd29a92e052fb9d1a2330204543 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -20,7 +20,6 @@
  *\r
  */\r
 \r
-#include "src/lib/16_tail.h"\r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/wcpu.h"\r
@@ -62,39 +61,10 @@ void main(int argc, char *argv[])
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
-       // DOSLIB: check our environment\r
-       probe_dos();\r
-\r
-       // DOSLIB: what CPU are we using?\r
-       // NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.\r
-       //      So this code by itself shouldn't care too much what CPU it's running on. Except that other\r
-       //      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for\r
-       //      the CPU to carry out tasks. --J.C.\r
-       cpu_probe();\r
-\r
-       // DOSLIB: check for VGA\r
-       if (!probe_vga()) {\r
-               printf("VGA probe failed\n");\r
-               return;\r
-       }\r
-       // hardware must be VGA or higher!\r
-       if (!(vga_state.vga_flags & VGA_IS_VGA)) {\r
-               printf("This program requires VGA or higher graphics hardware\n");\r
-               return;\r
-       }\r
-\r
-       if (_DEBUG_INIT() == 0) {\r
-#ifdef DEBUGSERIAL\r
-               printf("WARNING: Failed to initialize DEBUG output\n");\r
-#endif\r
-       }\r
-       _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log\r
-       _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r
+       Startup16(&gvar);\r
 \r
        pan.pn=1;\r
 \r
-       start_timer(&gvar);\r
-\r
        /* create the map */\r
        fprintf(stderr, "testing map load~      ");\r
        loadmap("data/test.map", &map);\r
@@ -119,7 +89,6 @@ void main(int argc, char *argv[])
 \r
 #endif\r
        /*      input!  */\r
-       IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick);\r
        //IN_Default(1,&player,ctrl_Joystick);\r
 \r
@@ -318,7 +287,7 @@ void main(int argc, char *argv[])
 #endif\r
        VGAmodeX(0, 1, &gvar);\r
 #endif\r
-       IN_Shutdown();\r
+       Shutdown16(&gvar);\r
        printf("\nProject 16 scroll.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        printf("tx: %d  ", mv[0].tx);\r