MOUSE WORKS NOW! i should continue on the other stuff in p16 such as showmemory funct...

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

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index 4d6040cb640fcbb51a9907bf805aeb7998b76c3d..c8e1ee81632d245ec51501e8d9058dbce9241de3 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -171,7 +171,6 @@ void ReadConfig(void)
 \r
                read(file,&mouseenabled,sizeof(mouseenabled));\r
                read(file,&joystickenabled,sizeof(joystickenabled));\r
-               read(file,&joypadenabled,sizeof(joypadenabled));\r
                read(file,&joystickprogressive,sizeof(joystickprogressive));\r
                read(file,&joystickport,sizeof(joystickport));\r
 \r
@@ -230,7 +229,6 @@ void ReadConfig(void)
                        mouseenabled = true;\r
 \r
                joystickenabled = false;\r
-               joypadenabled = false;\r
                joystickport = 0;\r
                joystickprogressive = false;\r
 \r
@@ -269,7 +267,6 @@ void WriteConfig(void)
 \r
                write(file,&mouseenabled,sizeof(mouseenabled));\r
                write(file,&joystickenabled,sizeof(joystickenabled));\r
-               write(file,&joypadenabled,sizeof(joypadenabled));\r
                write(file,&joystickprogressive,sizeof(joystickprogressive));\r
                write(file,&joystickport,sizeof(joystickport));\r
 \r
@@ -409,69 +406,6 @@ noxor:
 \r
 //===========================================================================\r
 \r
-/*\r
-=============================================================================\r
-\r
-                                               MUSIC STUFF\r
-\r
-=============================================================================\r
-*/\r
-\r
-\r
-/*\r
-=================\r
-=\r
-= StopMusic\r
-=\r
-=================\r
-*/\r
-\r
-void TL_StopMusic(global_game_variables_t *gvar)\r
-{\r
-       int     i;\r
-\r
-       SD_MusicOff();\r
-       for (i = 0;i < LASTMUSIC;i++)\r
-               if (gvar->ca.audiosegs[STARTMUSIC + i])\r
-               {\r
-                       MM_SetPurge(MEMPTRCONV gvar->ca.audiosegs[STARTMUSIC + i],3, gvar);\r
-                       MM_SetLock(MEMPTRCONV gvar->ca.audiosegs[STARTMUSIC + i],false, gvar);\r
-               }\r
-}\r
-\r
-//==========================================================================\r
-\r
-\r
-/*\r
-=================\r
-=\r
-= StartMusic\r
-=\r
-=================\r
-*/\r
-\r
-void TL_StartMusic(global_game_variables_t *gvar)\r
-{\r
-       musicnames      chunk;\r
-\r
-       SD_MusicOff();\r
-       chunk = 0;//++++songs[gamestate.mapon+gamestate.episode*10];\r
-\r
-//     if ((chunk == -1) || (MusicMode != smm_AdLib))\r
-//DEBUG control panel          return;\r
-\r
-//++++ MM_BombOnError (false,gvar);\r
-//++++ CA_CacheAudioChunk(STARTMUSIC + chunk, gvar);\r
-//++++ MM_BombOnError (true,gvar);\r
-//++++ if (gvar->mm.mmerror)\r
-//++++         gvar->mm.mmerror = false;\r
-//++++ else\r
-//++++ {\r
-               MM_SetLock(MEMPTRCONV gvar->ca.audiosegs[STARTMUSIC + chunk],true, gvar);\r
-               SD_StartMusic((MusicGroup far *)gvar->ca.audiosegs[STARTMUSIC + chunk]);\r
-//++++ }\r
-}\r
-\r
 /*\r
 ==================\r
 =\r