diff --git a/src/configuration.c b/src/configuration.c index 1df397c65..f707c011a 100644 --- a/src/configuration.c +++ b/src/configuration.c @@ -93,13 +93,6 @@ BOOL loadConfig(void) // options screens. // ////////////////////////// - // ////////////////////////// - // subtitles - if(getWarzoneKeyNumeric("allowsubtitles", &val)) - { - war_SetAllowSubtitles(val); - } - // ////////////////////////// // voice vol if(getWarzoneKeyNumeric("voicevol", &val)) @@ -730,7 +723,6 @@ BOOL saveConfig(void) { setDifficultyLevel(DL_NORMAL); } - setWarzoneKeyNumeric("allowSubtitles", war_GetAllowSubtitles()); setWarzoneKeyNumeric("debugmode", bAllowDebugMode); setWarzoneKeyNumeric("framerate", (SDWORD)getFramerateLimit()); setWarzoneKeyNumeric("showFPS", (SDWORD)showFPS); diff --git a/src/frontend.c b/src/frontend.c index c7a352362..ca5aa1a9e 100644 --- a/src/frontend.c +++ b/src/frontend.c @@ -695,22 +695,14 @@ BOOL startGameOptions2Menu(void) //////////// //subtitle mode. - if(war_GetAllowSubtitles()) + addTextButton(FRONTEND_SUBTITLES, FRONTEND_POS5X - 35, FRONTEND_POS5Y, _("Subtitles"), 0); + if (!seq_GetSubtitles()) { - addTextButton(FRONTEND_SUBTITLES, FRONTEND_POS5X-35,FRONTEND_POS5Y, _("Subtitles"), 0); - if ( !seq_GetSubtitles() ) - { - addTextButton(FRONTEND_SUBTITLES_R, FRONTEND_POS5M-55,FRONTEND_POS5Y, _("Off"), 0); - } - else - { - addTextButton(FRONTEND_SUBTITLES_R, FRONTEND_POS5M-55,FRONTEND_POS5Y, _("On"), 0); - } + addTextButton(FRONTEND_SUBTITLES_R, FRONTEND_POS5M - 55, FRONTEND_POS5Y, _("Off"), 0); } else { - addTextButton(FRONTEND_SUBTITLES, FRONTEND_POS5X-35, FRONTEND_POS5Y, _("Subtitles"), WBUT_DISABLE); - addTextButton(FRONTEND_SUBTITLES_R, FRONTEND_POS5M-55, FRONTEND_POS5Y, _("Off"), WBUT_DISABLE); + addTextButton(FRONTEND_SUBTITLES_R, FRONTEND_POS5M - 55, FRONTEND_POS5Y, _("On"), 0); } //////////// diff --git a/src/warzoneconfig.c b/src/warzoneconfig.c index d83fb38fc..89611d26c 100644 --- a/src/warzoneconfig.c +++ b/src/warzoneconfig.c @@ -46,7 +46,6 @@ typedef struct _warzoneGlobals FMV_MODE FMVmode; BOOL bFog; SWORD effectsLevel; - BOOL allowSubtitles; BOOL Fullscreen; BOOL soundEnabled; BOOL trapCursor; @@ -95,14 +94,6 @@ void war_SetDefaultStates(void)//Sets all states war_SetMusicEnabled(true); } -void war_SetAllowSubtitles(BOOL b) { - warGlobs.allowSubtitles = b; -} - -BOOL war_GetAllowSubtitles(void) { - return warGlobs.allowSubtitles; -} - void war_setFullscreen(BOOL b) { warGlobs.Fullscreen = b; }