scroll.exe works again but the fps thingy dose not work because of MM

diff --git a/src/inputest.c b/src/inputest.c
index cd566a344a8654469fbc650f24e679368500e250..c4b59fd9a53de400a22caf770144b3ece674e058 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -36,6 +36,8 @@ main(int argc, char *argv[])
        dbg_noplayerinpu=0;\r
        if(!dbg_noplayerinpu)\r
        {\r
+               start_timer(&gvar);\r
+               //Startup16(&gvar);\r
                IN_Startup();\r
                //IN_Default(0,&player,ctrl_Joystick1);\r
                //IN_SetControlType(0,&player,ctrl_Joystick1);\r
@@ -46,7 +48,7 @@ main(int argc, char *argv[])
        player[0].d=2;\r
        player[0].persist_aniframe=0;\r
        player[0].speed=4;\r
-       start_timer(&gvar);\r
+\r
        nibbletest();\r
        if(dbg_noplayerinpu) getch();\r
        booleantest();\r
@@ -113,7 +115,9 @@ main(int argc, char *argv[])
                        //IN_Ack();\r
                }\r
        }\r
-       IN_Shutdown(); }\r
+       IN_Shutdown();\r
+               //Shutdown16(&gvar);\r
+       }\r
        //printf("%u\n", in.Keyboard[sc_Escape]);\r
        printf("inputest.exe ");\r
        printf("version %s\n", VERSION);\r

diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c
index 960e76049faa683fff1e413678951f5669c70e75..9594b6cfeb4cfe916696e23c10867e96a5edead8 100755 (executable)
--- a/src/lib/16_dbg.c
+++ b/src/lib/16_dbg.c
@@ -9,6 +9,7 @@ boolean dbg_debugpm=0;
 #ifdef __DEBUG_InputMgr__\r
 boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0,dbg_noplayerinpu=0;\r
 #endif\r
+boolean dbg_nommpmca=0;\r
 #endif\r
 \r
 \r

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index 32c89b5913acacfb73f0424265ffa0001b1fa3f4..381ed567d694d0485c6ca72a1ac3871ac10a664f 100755 (executable)
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -18,6 +18,7 @@ extern boolean dbg_debugpm;
 #ifdef __DEBUG_InputMgr__\r
 extern boolean dbg_testkeyin,dbg_testcontrolnoisy,dbg_noplayerinpu;\r
 #endif\r
+extern boolean dbg_nommpmca;\r
 #endif\r
 \r
 # ifdef DEBUGSERIAL\r

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 414e51a17c3bb33a5ce82106c127d7a9a19d13b0..02216ce65260276b2d13c08ca25f61a40d395936 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -38,6 +38,8 @@
 void Startup16(global_game_variables_t *gvar)\r
 {\r
 #ifdef __WATCOMC__\r
+       start_timer(gvar);\r
+\r
        // DOSLIB: check our environment\r
        probe_dos();\r
 \r
@@ -69,16 +71,21 @@ void Startup16(global_game_variables_t *gvar)
 #endif\r
        gvar->mm.mmstarted=0;\r
        gvar->pm.PMStarted=0;\r
+#ifdef __DEBUG__\r
+       if(!dbg_nommpmca)\r
+#endif\r
        MM_Startup(gvar);\r
 if(!dbg_noplayerinpu)\r
        IN_Startup(gvar);\r
+#ifdef __DEBUG__\r
+       if(!dbg_nommpmca){\r
+#endif\r
        PM_Startup(gvar);\r
        PM_UnlockMainMem(gvar);\r
        CA_Startup(gvar);\r
-#ifdef __WATCOMC__\r
-       start_timer(gvar);\r
+#ifdef __DEBUG__\r
+       }\r
 #endif\r
-\r
 }\r
 \r
 //===========================================================================\r
@@ -95,11 +102,20 @@ if(!dbg_noplayerinpu)
 \r
 void Shutdown16(global_game_variables_t *gvar)\r
 {\r
+#ifdef __DEBUG__\r
+       if(!dbg_nommpmca)\r
+#endif\r
        PM_Shutdown(gvar);\r
 if(!dbg_noplayerinpu)\r
        IN_Shutdown(gvar);\r
+#ifdef __DEBUG__\r
+       if(!dbg_nommpmca){\r
+#endif\r
        CA_Shutdown(gvar);\r
        MM_Shutdown(gvar);\r
+#ifdef __DEBUG__\r
+       }\r
+#endif\r
 }\r
 \r
 \r

diff --git a/src/scroll.c b/src/scroll.c
index 114cad0f1da08c73362e3139c186d1afa584900e..bb0863045ea27ad95b12a4409cca71506017c570 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -29,7 +29,7 @@
 //#define FADE\r
 #define MODEX  //this is for mode x initiating\r
 \r
-//boolean dbg_noplayerinpu=1;\r
+boolean dbg_nommpmca=1;\r
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 //bitmap_t *p;\r
@@ -69,8 +69,6 @@ void main(int argc, char *argv[])
 \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
@@ -96,11 +94,7 @@ void main(int argc, char *argv[])
 #endif\r
        /*      input!  */\r
        if(!dbg_noplayerinpu)\r
-       {\r
-       IN_Startup();\r
        IN_Default(0,&player,ctrl_Keyboard1);\r
-       //IN_Default(1,&player,ctrl_Joystick);\r
-       }\r
 \r
        /* save the palette */\r
 #ifdef MODEX\r
@@ -205,7 +199,7 @@ void main(int argc, char *argv[])
        if(!panswitch){\r
                walk(mv, &player, 0);\r
        }else{\r
-               panpagemanual(mv, player, 0);\r
+               panpagemanual(mv, &player, 0);\r
                //printf("      player[0].q: %d", player[0].q); printf("        player[0].d: %d\n", player[0].d);\r
        }\r
 \r
@@ -303,8 +297,7 @@ void main(int argc, char *argv[])
 #endif\r
        VGAmodeX(0, 1, &gvar);\r
 #endif\r
-       if(!dbg_noplayerinpu)\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
@@ -333,8 +326,7 @@ void main(int argc, char *argv[])
        //printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("      mv[%u].ty: %d   ", pan.pn, mv[pan.pn].ty);\r
        printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);\r
        printf("pageflipflop=%u\n", pageflipflop);\r
-       //0000printf("\ngvar.video.tickclk=%f\n", gvar.video.tickclk);\r
-       //0000printf("gvar.video.clk=%f", gvar.video.clk);\r
+       //printf("gvar.kurokku: "); printf("%.0f ", clock());   printf("tiku=%lu ", gvar.kurokku.tiku); printf("t=%.0f ", gvar.kurokku.t);      printf("ticktock()=%f ", ticktock(&gvar));      printf("%.0f fps", (double)gvar.kurokku.tiku/ticktock(&gvar));\r
        printf("\n");\r
        //printf("map.width=%d  map.height=%d   map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);\r
 \r