X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_tail.c;h=742e113289140267c3ddb5d2562b46a02556d7bb;hb=3e67fca24b59811ced65929a140f6c242b161d90;hp=6b08e0fb9180cd4e7fac221625cc7aba8ecf455b;hpb=f2a811af6076e5d139acaef8c0fcf7c40244d8ed;p=16.git

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 6b08e0fb..742e1132 100755
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -36,25 +36,19 @@
 ==========================
 */
 
-void Startup16(global_game_variables_t *gvar)
+void Startup16 (global_game_variables_t *gvar)
 {
 	gvar->video.VL_Started=0;
 	TL_VidInit(gvar);
 	gvar->mm.mmstarted=0;
 	gvar->pm.PMStarted=0;
-	MM_Startup(gvar);
+	StartupCAMMPM(gvar);
 #ifdef __WATCOMC__
 #ifdef __DEBUG_InputMgr__
 	if(!dbg_nointest)
 #endif
 	IN_Startup(gvar);
 #endif
-#ifdef __16_PM__
-	PM_Startup(gvar);
-	PM_CheckMainMem(gvar);
-	PM_UnlockMainMem(gvar);
-#endif
-	CA_Startup(gvar);
 }
 
 //===========================================================================
@@ -69,19 +63,15 @@ void Startup16(global_game_variables_t *gvar)
 ==========================
 */
 
-void Shutdown16(global_game_variables_t *gvar)
+void Shutdown16 (global_game_variables_t *gvar)
 {
-#ifdef __16_PM__
-	PM_Shutdown(gvar);
-#endif
 #ifdef __WATCOMC__
 #ifdef __DEBUG_InputMgr__
 	if(!dbg_nointest)
 #endif
 	IN_Shutdown(gvar);
 #endif
-	CA_Shutdown(gvar);
-	MM_Shutdown(gvar);
+	ShutdownCAMMPM(gvar);
 #ifdef __WATCOMC__
 	if(gvar->video.VL_Started)
 		VL_Shutdown (gvar);//VGAmodeX(0, 1, gvar);
@@ -90,6 +80,68 @@ void Shutdown16(global_game_variables_t *gvar)
 
 //===========================================================================
 
+/*
+==========================
+=
+= StartupCAMMPM
+=
+==========================
+*/
+
+void StartupCAMMPM (global_game_variables_t *gvar)
+{
+/*
+ 	MM_Startup ();                  // so the signon screen can be freed
+
+	SignonScreen ();
+
+	VW_Startup ();
+	IN_Startup ();
+	PM_Startup ();
+	PM_UnlockMainMem ();
+	SD_Startup ();
+	CA_Startup ();
+	US_Startup ();
+*/
+	MM_Startup(gvar);
+#ifdef __16_PM__
+	PM_Startup(gvar);
+//????	PM_CheckMainMem(gvar);
+	PM_UnlockMainMem(gvar);
+#endif
+	CA_Startup(gvar);
+}
+
+//===========================================================================
+
+/*
+==========================
+=
+= ShutdownCAMMPM
+=
+==========================
+*/
+
+void ShutdownCAMMPM (global_game_variables_t *gvar)
+{
+/*
+	US_Shutdown ();
+	SD_Shutdown ();
+	PM_Shutdown ();
+	IN_Shutdown ();
+	VW_Shutdown ();
+	CA_Shutdown ();
+	MM_Shutdown ()
+*/
+#ifdef __16_PM__
+	PM_Shutdown(gvar);
+#endif
+	CA_Shutdown(gvar);
+	MM_Shutdown(gvar);
+}
+
+//===========================================================================
+
 /*
 ====================
 =