thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MAIN: Fix --gfx-mode regression

Browse source 
We cannot check for supported graphics mode until after the backend has
been initialised, or there won't be a graphics manager to ask.

svn-id: r54534
This commit is contained in:
Torbjörn Andersson 2010-11-28 17:26:27 +00:00
parent bed8c34a87
commit 1857076d76
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
base/commandLine.cpp
View file

@ -383,19 +383,6 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
END_OPTION
DO_OPTION('g', "gfx-mode")
// Check whether 'option' specifies a valid graphics mode.
bool isValid = false;
if (!scumm_stricmp(option, "normal") || !scumm_stricmp(option, "default"))
isValid = true;
if (!isValid) {
const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
while (gm->name && !isValid) {
isValid = !scumm_stricmp(gm->name, option);
gm++;
}
}
if (!isValid)
usage("Unrecognized graphics mode '%s'", option);
END_OPTION
DO_OPTION_INT('m', "music-volume")