diff options
| author | Torbjörn Andersson | 2004-03-28 13:12:10 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-03-28 13:12:10 +0000 |
| commit | 93336d8bc9752a55c2374542c9915a2112e17bcb (patch) | |
| tree | 1e40d23d2db9f4d09b149feaf8bbeaab4648f5fd /sword2/sword2.cpp | |
| parent | d109cc1f985ab6e6827bcad54bee94498d1f5501 (diff) | |
| download | scummvm-rg350-93336d8bc9752a55c2374542c9915a2112e17bcb.tar.gz scummvm-rg350-93336d8bc9752a55c2374542c9915a2112e17bcb.tar.bz2 scummvm-rg350-93336d8bc9752a55c2374542c9915a2112e17bcb.zip | |
Don't show the restart/restore dialog if a boot parameter has been given.
And a teensy-weensy little cleanup.
svn-id: r13399
Diffstat (limited to 'sword2/sword2.cpp')
| -rw-r--r-- | sword2/sword2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index f977cc7043..b52c8983ae 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -313,7 +313,7 @@ void Sword2Engine::go() { if (!_gui->restoreControl()) startGame(); } - } else if (saveExists()) { + } else if (!_bootParam && saveExists()) { int32 pars[2] = { 221, FX_LOOP }; bool result; @@ -530,8 +530,8 @@ void Sword2Engine::unpauseGame(void) { unpauseAllSound(); - // put back game screen palette; see Build_display.cpp - setFullPalette(0xffffffff); + // put back game screen palette; see build_display.cpp + setFullPalette(-1); // If graphics level at max, turn up again if (_graphicsLevelFudged) { |