xcrollbroke

[16.git] / src / lib / 16_tail.c

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 6b08e0fb9180cd4e7fac221625cc7aba8ecf455b..e9b0be9ad9b0ad9f7b4a7750777bf4c82d516859 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -36,25 +36,19 @@
 ==========================\r
 */\r
 \r
-void Startup16(global_game_variables_t *gvar)\r
+void Startup16 (global_game_variables_t *gvar)\r
 {\r
        gvar->video.VL_Started=0;\r
        TL_VidInit(gvar);\r
        gvar->mm.mmstarted=0;\r
        gvar->pm.PMStarted=0;\r
-       MM_Startup(gvar);\r
+       StartupCAMMPM(gvar);\r
 #ifdef __WATCOMC__\r
 #ifdef __DEBUG_InputMgr__\r
        if(!dbg_nointest)\r
 #endif\r
        IN_Startup(gvar);\r
 #endif\r
-#ifdef __16_PM__\r
-       PM_Startup(gvar);\r
-       PM_CheckMainMem(gvar);\r
-       PM_UnlockMainMem(gvar);\r
-#endif\r
-       CA_Startup(gvar);\r
 }\r
 \r
 //===========================================================================\r
@@ -69,19 +63,15 @@ void Startup16(global_game_variables_t *gvar)
 ==========================\r
 */\r
 \r
-void Shutdown16(global_game_variables_t *gvar)\r
+void Shutdown16 (global_game_variables_t *gvar)\r
 {\r
-#ifdef __16_PM__\r
-       PM_Shutdown(gvar);\r
-#endif\r
 #ifdef __WATCOMC__\r
 #ifdef __DEBUG_InputMgr__\r
        if(!dbg_nointest)\r
 #endif\r
        IN_Shutdown(gvar);\r
 #endif\r
-       CA_Shutdown(gvar);\r
-       MM_Shutdown(gvar);\r
+       ShutdownCAMMPM(gvar);\r
 #ifdef __WATCOMC__\r
        if(gvar->video.VL_Started)\r
                VL_Shutdown (gvar);//VGAmodeX(0, 1, gvar);\r
@@ -90,6 +80,68 @@ void Shutdown16(global_game_variables_t *gvar)
 \r
 //===========================================================================\r
 \r
+/*\r
+==========================\r
+=\r
+= StartupCAMMPM\r
+=\r
+==========================\r
+*/\r
+\r
+void StartupCAMMPM (global_game_variables_t *gvar)\r
+{\r
+/*\r
+       MM_Startup ();                  // so the signon screen can be freed\r
+\r
+       SignonScreen ();\r
+\r
+       VW_Startup ();\r
+       IN_Startup ();\r
+       PM_Startup ();\r
+       PM_UnlockMainMem ();\r
+       SD_Startup ();\r
+       CA_Startup ();\r
+       US_Startup ();\r
+*/\r
+       MM_Startup(gvar);\r
+#ifdef __16_PM__\r
+       PM_Startup(gvar);\r
+//???? PM_CheckMainMem(gvar);\r
+       PM_UnlockMainMem(gvar);\r
+#endif\r
+       CA_Startup(gvar);\r
+}\r
+\r
+//===========================================================================\r
+\r
+/*\r
+==========================\r
+=\r
+= ShutdownCAMMPM\r
+=\r
+==========================\r
+*/\r
+\r
+void ShutdownCAMMPM (global_game_variables_t *gvar)\r
+{\r
+/*\r
+       US_Shutdown ();\r
+       SD_Shutdown ();\r
+       PM_Shutdown ();\r
+       IN_Shutdown ();\r
+       VW_Shutdown ();\r
+       CA_Shutdown ();\r
+       MM_Shutdown ()\r
+*/\r
+#ifdef __16_PM__\r
+       PM_Shutdown(gvar);\r
+#endif\r
+       CA_Shutdown(gvar);\r
+       MM_Shutdown(gvar);\r
+}\r
+\r
+//===========================================================================\r
+\r
 /*\r
 ====================\r
 =\r
@@ -423,12 +475,13 @@ void ClearMemory (global_game_variables_t *gvar)
 ==========================\r
 */\r
 \r
-void Quit (global_game_variables_t *gvar, char *error)\r
+void Quit (char *error)\r
 {\r
+\r
        //unsigned              finscreen;\r
        memptr  screen=0;\r
 \r
-       ClearMemory (gvar);\r
+       ClearMemory (ggvv);\r
        if (!*error)\r
        {\r
 // #ifndef JAPAN\r
@@ -442,7 +495,7 @@ void Quit (global_game_variables_t *gvar, char *error)
 //             CA_CacheGrChunk (ERRORSCREEN);\r
 //             screen = grsegs[ERRORSCREEN];\r
        }\r
-       Shutdown16(gvar);\r
+       Shutdown16(ggvv);\r
 \r
        if (error && *error)\r
        {\r