16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 742e113289140267c3ddb5d2562b46a02556d7bb..b56a6600b921f896880cf19f6da268ef9958bab5 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -149,25 +149,25 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 =\r
 ====================\r
 */\r
-\r
-/*void ReadConfig(void)\r
+#if 0\r
+void ReadConfig(void)\r
 {\r
        int                                      file;\r
-       SDMode            sd;\r
-       SMMode            sm;\r
-       SDSMode          sds;\r
+//     SDMode            sd;\r
+//     SMMode            sm;\r
+//     SDSMode          sds;\r
 \r
 \r
-       if ( (file = open(configname,O_BINARY | O_RDONLY)) != -1)\r
+       if ( (file = open(CONFIGNAME,O_BINARY | O_RDONLY)) != -1)\r
        {\r
        //\r
        // valid config file\r
        //\r
-               read(file,Scores,sizeof(HighScore) * MaxScores);\r
+//             read(file,Scores,sizeof(HighScore) * MaxScores);\r
 \r
-               read(file,&sd,sizeof(sd));\r
-               read(file,&sm,sizeof(sm));\r
-               read(file,&sds,sizeof(sds));\r
+//             read(file,&sd,sizeof(sd));\r
+//             read(file,&sm,sizeof(sm));\r
+//             read(file,&sds,sizeof(sds));\r
 \r
                read(file,&mouseenabled,sizeof(mouseenabled));\r
                read(file,&joystickenabled,sizeof(joystickenabled));\r
@@ -185,7 +185,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 \r
                close(file);\r
 \r
-               if (sd == sdm_AdLib && !AdLibPresent && !SoundBlasterPresent)\r
+               /*if (sd == sdm_AdLib && !AdLibPresent && !SoundBlasterPresent)\r
                {\r
                        sd = sdm_PC;\r
                        sd = smm_Off;\r
@@ -193,7 +193,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 \r
                if ((sds == sds_SoundBlaster && !SoundBlasterPresent) ||\r
                        (sds == sds_SoundSource && !SoundSourcePresent))\r
-                       sds = sds_Off;\r
+                       sds = sds_Off;*/\r
 \r
                if (!MousePresent)\r
                        mouseenabled = false;\r
@@ -208,7 +208,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
        //\r
        // no config file, so select by hardware\r
        //\r
-               if (SoundBlasterPresent || AdLibPresent)\r
+/*             if (SoundBlasterPresent || AdLibPresent)\r
                {\r
                        sd = sdm_AdLib;\r
                        sm = smm_AdLib;\r
@@ -224,7 +224,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
                else if (SoundSourcePresent)\r
                        sds = sds_SoundSource;\r
                else\r
-                       sds = sds_Off;\r
+                       sds = sds_Off;*/\r
 \r
                if (MousePresent)\r
                        mouseenabled = true;\r
@@ -241,7 +241,7 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
        SD_SetMusicMode (sm);\r
        SD_SetSoundMode (sd);\r
        SD_SetDigiDevice (sds);\r
-}*/\r
+}\r
 \r
 \r
 /*\r
@@ -252,20 +252,20 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
 ====================\r
 */\r
 \r
-/*void WriteConfig(void)\r
+void WriteConfig(void)\r
 {\r
        int                                      file;\r
 \r
-       file = open(configname,O_CREAT | O_BINARY | O_WRONLY,\r
+       file = open(CONFIGNAME,O_CREAT | O_BINARY | O_WRONLY,\r
                                S_IREAD | S_IWRITE | S_IFREG);\r
 \r
        if (file != -1)\r
        {\r
-               write(file,Scores,sizeof(HighScore) * MaxScores);\r
+//             write(file,Scores,sizeof(HighScore) * MaxScores);\r
 \r
-               write(file,&SoundMode,sizeof(SoundMode));\r
-               write(file,&MusicMode,sizeof(MusicMode));\r
-               write(file,&DigiMode,sizeof(DigiMode));\r
+//             write(file,&SoundMode,sizeof(SoundMode));\r
+//             write(file,&MusicMode,sizeof(MusicMode));\r
+//             write(file,&DigiMode,sizeof(DigiMode));\r
 \r
                write(file,&mouseenabled,sizeof(mouseenabled));\r
                write(file,&joystickenabled,sizeof(joystickenabled));\r
@@ -278,13 +278,13 @@ void ShutdownCAMMPM (global_game_variables_t *gvar)
                write(file,&buttonmouse,sizeof(buttonmouse));\r
                write(file,&buttonjoy,sizeof(buttonjoy));\r
 \r
-               write(file,&viewsize,sizeof(viewsize));\r
+//             write(file,&viewsize,sizeof(viewsize));\r
                write(file,&mouseadjustment,sizeof(mouseadjustment));\r
 \r
                close(file);\r
        }\r
-}*/\r
-\r
+}\r
+#endif\r
 //===========================================================================\r
 \r
 /*\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 3fa1feb335ced492a655faf2c2195e411e338469..ffc4ae6f136988396310a5131cc10386c694624a 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -41,6 +41,8 @@
 #define BOFS page[1].data\r
 #define DOFS page[0].data\r
 \r
+#define CONFIGNAME "config.16"\r
+\r
 /*\r
  * typedefs of the game variables!\r
  */\r