X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=blobdiff_plain;f=src%2Flib%2F16_tail.c;h=c8e1ee81632d245ec51501e8d9058dbce9241de3;hp=4d6040cb640fcbb51a9907bf805aeb7998b76c3d;hb=5af1604f7af6c1d1ab94299bfe6a4195b203a323;hpb=7f4d4eb8dd949433a9f66a6e4f26fb5bf51064ad diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c index 4d6040cb..c8e1ee81 100755 --- a/src/lib/16_tail.c +++ b/src/lib/16_tail.c @@ -171,7 +171,6 @@ void ReadConfig(void) read(file,&mouseenabled,sizeof(mouseenabled)); read(file,&joystickenabled,sizeof(joystickenabled)); - read(file,&joypadenabled,sizeof(joypadenabled)); read(file,&joystickprogressive,sizeof(joystickprogressive)); read(file,&joystickport,sizeof(joystickport)); @@ -230,7 +229,6 @@ void ReadConfig(void) mouseenabled = true; joystickenabled = false; - joypadenabled = false; joystickport = 0; joystickprogressive = false; @@ -269,7 +267,6 @@ void WriteConfig(void) write(file,&mouseenabled,sizeof(mouseenabled)); write(file,&joystickenabled,sizeof(joystickenabled)); - write(file,&joypadenabled,sizeof(joypadenabled)); write(file,&joystickprogressive,sizeof(joystickprogressive)); write(file,&joystickport,sizeof(joystickport)); @@ -409,69 +406,6 @@ noxor: //=========================================================================== -/* -============================================================================= - - MUSIC STUFF - -============================================================================= -*/ - - -/* -================= -= -= StopMusic -= -================= -*/ - -void TL_StopMusic(global_game_variables_t *gvar) -{ - int i; - - SD_MusicOff(); - for (i = 0;i < LASTMUSIC;i++) - if (gvar->ca.audiosegs[STARTMUSIC + i]) - { - MM_SetPurge(MEMPTRCONV gvar->ca.audiosegs[STARTMUSIC + i],3, gvar); - MM_SetLock(MEMPTRCONV gvar->ca.audiosegs[STARTMUSIC + i],false, gvar); - } -} - -//========================================================================== - - -/* -================= -= -= StartMusic -= -================= -*/ - -void TL_StartMusic(global_game_variables_t *gvar) -{ - musicnames chunk; - - SD_MusicOff(); - chunk = 0;//++++songs[gamestate.mapon+gamestate.episode*10]; - -// if ((chunk == -1) || (MusicMode != smm_AdLib)) -//DEBUG control panel return; - -//++++ MM_BombOnError (false,gvar); -//++++ CA_CacheAudioChunk(STARTMUSIC + chunk, gvar); -//++++ MM_BombOnError (true,gvar); -//++++ if (gvar->mm.mmerror) -//++++ gvar->mm.mmerror = false; -//++++ else -//++++ { - MM_SetLock(MEMPTRCONV gvar->ca.audiosegs[STARTMUSIC + chunk],true, gvar); - SD_StartMusic((MusicGroup far *)gvar->ca.audiosegs[STARTMUSIC + chunk]); -//++++ } -} - /* ================== =