From 18e1b0c530d68a65c6e9434b03ad8df4c1985a1a Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Fri, 28 Apr 2017 09:36:20 -0500
Subject: [PATCH] 16_ca needs huge amounts of work and I should remember what
 needs to be done soon[going to port rest of code to borland c some time so we
 can use the core components of id engine here ][going to add 16_us.c
 eventually but the debug system and CA_ PM_ and MM_ usage is priority
 now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop
 system with PROPER data usage with CAMMPM] added 1st scroll back [i work on
 CA]

---
 src/lib/16_tail.c | 48 +++++++++++++++++++++++------------------------
 src/lib/16_tdef.h |  2 ++
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 742e1132..b56a6600 100755
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -149,25 +149,25 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 =
 ====================
 */
-
-/*void ReadConfig(void)
+#if 0
+void ReadConfig(void)
 {
 	int					 file;
-	SDMode		  sd;
-	SMMode		  sm;
-	SDSMode		 sds;
+//	SDMode		  sd;
+//	SMMode		  sm;
+//	SDSMode		 sds;
 
 
-	if ( (file = open(configname,O_BINARY | O_RDONLY)) != -1)
+	if ( (file = open(CONFIGNAME,O_BINARY | O_RDONLY)) != -1)
 	{
 	//
 	// valid config file
 	//
-		read(file,Scores,sizeof(HighScore) * MaxScores);
+//		read(file,Scores,sizeof(HighScore) * MaxScores);
 
-		read(file,&sd,sizeof(sd));
-		read(file,&sm,sizeof(sm));
-		read(file,&sds,sizeof(sds));
+//		read(file,&sd,sizeof(sd));
+//		read(file,&sm,sizeof(sm));
+//		read(file,&sds,sizeof(sds));
 
 		read(file,&mouseenabled,sizeof(mouseenabled));
 		read(file,&joystickenabled,sizeof(joystickenabled));
@@ -185,7 +185,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 
 		close(file);
 
-		if (sd == sdm_AdLib && !AdLibPresent && !SoundBlasterPresent)
+		/*if (sd == sdm_AdLib && !AdLibPresent && !SoundBlasterPresent)
 		{
 			sd = sdm_PC;
 			sd = smm_Off;
@@ -193,7 +193,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 
 		if ((sds == sds_SoundBlaster && !SoundBlasterPresent) ||
 			(sds == sds_SoundSource && !SoundSourcePresent))
-			sds = sds_Off;
+			sds = sds_Off;*/
 
 		if (!MousePresent)
 			mouseenabled = false;
@@ -208,7 +208,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 	//
 	// no config file, so select by hardware
 	//
-		if (SoundBlasterPresent || AdLibPresent)
+/*		if (SoundBlasterPresent || AdLibPresent)
 		{
 			sd = sdm_AdLib;
 			sm = smm_AdLib;
@@ -224,7 +224,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 		else if (SoundSourcePresent)
 			sds = sds_SoundSource;
 		else
-			sds = sds_Off;
+			sds = sds_Off;*/
 
 		if (MousePresent)
 			mouseenabled = true;
@@ -241,7 +241,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 	SD_SetMusicMode (sm);
 	SD_SetSoundMode (sd);
 	SD_SetDigiDevice (sds);
-}*/
+}
 
 
 /*
@@ -252,20 +252,20 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 ====================
 */
 
-/*void WriteConfig(void)
+void WriteConfig(void)
 {
 	int					 file;
 
-	file = open(configname,O_CREAT | O_BINARY | O_WRONLY,
+	file = open(CONFIGNAME,O_CREAT | O_BINARY | O_WRONLY,
 				S_IREAD | S_IWRITE | S_IFREG);
 
 	if (file != -1)
 	{
-		write(file,Scores,sizeof(HighScore) * MaxScores);
+//		write(file,Scores,sizeof(HighScore) * MaxScores);
 
-		write(file,&SoundMode,sizeof(SoundMode));
-		write(file,&MusicMode,sizeof(MusicMode));
-		write(file,&DigiMode,sizeof(DigiMode));
+//		write(file,&SoundMode,sizeof(SoundMode));
+//		write(file,&MusicMode,sizeof(MusicMode));
+//		write(file,&DigiMode,sizeof(DigiMode));
 
 		write(file,&mouseenabled,sizeof(mouseenabled));
 		write(file,&joystickenabled,sizeof(joystickenabled));
@@ -278,13 +278,13 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 		write(file,&buttonmouse,sizeof(buttonmouse));
 		write(file,&buttonjoy,sizeof(buttonjoy));
 
-		write(file,&viewsize,sizeof(viewsize));
+//		write(file,&viewsize,sizeof(viewsize));
 		write(file,&mouseadjustment,sizeof(mouseadjustment));
 
 		close(file);
 	}
-}*/
-
+}
+#endif
 //===========================================================================
 
 /*
diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 3fa1feb3..ffc4ae6f 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -41,6 +41,8 @@
 #define BOFS page[1].data
 #define DOFS page[0].data
 
+#define CONFIGNAME "config.16"
+
 /*
  * typedefs of the game variables!
  */
-- 
2.39.2