Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the allowSubtitles variable. 

Its default setting prevents the subtitle option in the menu to work (so this
fixes #1207), and I don't see any reason why we would actually want this.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10643 4a71c877-e1ca-e34f-864e-861f7616d084
master
Christian Ohm 2010-04-19 19:50:51 +00:00 committed by Git SVN Gateway
parent bff529f5fa
commit 06826961ac
3 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/configuration.c
View File

@ -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);

16
src/frontend.c
View File

@ -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);
}
////////////

9
src/warzoneconfig.c
View File

@ -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;
}