diff options
| author | Torbjörn Andersson | 2003-07-29 21:03:25 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-07-29 21:03:25 +0000 |
| commit | f4f63d71dbe1d721590e55be49cde6ddb28b6bc2 (patch) | |
| tree | 7a0af30ebea6503e228bc8d18b2b99e01531fd87 | |
| parent | aa6c99b5da92d9efacf881b31019426fab2a0e08 (diff) | |
| download | scummvm-rg350-f4f63d71dbe1d721590e55be49cde6ddb28b6bc2.tar.gz scummvm-rg350-f4f63d71dbe1d721590e55be49cde6ddb28b6bc2.tar.bz2 scummvm-rg350-f4f63d71dbe1d721590e55be49cde6ddb28b6bc2.zip | |
Partial fix for bug #779013. It no longer crashes, but the config file
setting still overrides the command-line option.
svn-id: r9283
| -rw-r--r-- | simon/simon.cpp | 4 | ||||
| -rw-r--r-- | sky/sky.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 7e10130e24..304e1d92d6 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -458,6 +458,8 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) _language = detector->_language; _noSubtitles = detector->_noSubtitles; + _system->init_size(320, 200); + // FIXME Use auto dirty rects cleanup code to reduce CPU usage _system->property(OSystem::PROP_WANT_RECT_OPTIM,0); @@ -4184,8 +4186,6 @@ void SimonEngine::openGameFile() { loadIconFile(); - _system->init_size(320, 200); - vc_34_force_lock(); startUp(1); diff --git a/sky/sky.cpp b/sky/sky.cpp index 7bd6fe2969..ccf3b233d9 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -92,6 +92,8 @@ SkyState::SkyState(GameDetector *detector, OSystem *syst) _detector = detector; _floppyIntro = detector->_floppyIntro; + + _system->init_size(320, 200); } SkyState::~SkyState() { |