diff options
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/gfx.cpp | 6 | ||||
-rw-r--r-- | scumm/saveload.cpp | 4 | ||||
-rw-r--r-- | scumm/script_v5.cpp | 2 | ||||
-rw-r--r-- | scumm/script_v6.cpp | 2 | ||||
-rw-r--r-- | scumm/scumm.h | 2 | ||||
-rw-r--r-- | scumm/scummvm.cpp | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 583e52698a..764e1d70ad 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -215,7 +215,7 @@ void ScummEngine::getGraphicsPerformance() { int i; for (i = 10; i != 0; i--) { - initScreens(0, 0, _screenWidth, _screenHeight); + initScreens(0, _screenWidth, _screenHeight); } if (VAR_PERFORMANCE_1 != 0xFF) // Variable is reserved for game scripts in earlier games @@ -230,9 +230,9 @@ void ScummEngine::getGraphicsPerformance() { VAR(VAR_PERFORMANCE_2) = 0; if (_version >= 7) - initScreens(0, 0, _screenWidth, _screenHeight); + initScreens(0, _screenWidth, _screenHeight); else - initScreens(0, 16, _screenWidth, 144); + initScreens(16, _screenWidth, 144); } void ScummEngine::initScreens(int a, int b, int w, int h) { diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 7ff7b32b09..18c1bfc9d9 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -161,7 +161,7 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) { gdi._mask.right = gdi._mask.bottom = 0; _charset->_hasMask = false; - initScreens(0, 0, _screenWidth, _screenHeight); + initScreens(0, _screenWidth, _screenHeight); // Force a fade to black int old_screenEffectFlag = _screenEffectFlag; @@ -169,7 +169,7 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) { fadeOut(129); _screenEffectFlag = old_screenEffectFlag ? true : false; - initScreens(0, sb, _screenWidth, sh); + initScreens(sb, _screenWidth, sh); _completeScreenRedraw = true; diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 45a16641c2..421f0df071 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -1847,7 +1847,7 @@ void ScummEngine_v5::o5_roomOps() { a = getVarOrDirectWord(PARAM_1); b = getVarOrDirectWord(PARAM_2); } - initScreens(0, a, _screenWidth, b); + initScreens(a, _screenWidth, b); break; case 4: // SO_ROOM_PALETTE if (_features & GF_SMALL_HEADER) { diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index f24df9fc6a..f6fe4c1891 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1526,7 +1526,7 @@ void ScummEngine_v6::o6_roomOps() { case 174: // SO_ROOM_SCREEN b = pop(); a = pop(); - initScreens(0, a, _screenWidth, b); + initScreens(a, _screenWidth, b); break; case 175: // SO_ROOM_PALETTE diff --git a/scumm/scumm.h b/scumm/scumm.h index 2023f06b28..18b6851be7 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -792,7 +792,7 @@ protected: StripTable *_roomStrips; void getGraphicsPerformance(); - void initScreens(int a, int b, int w, int h); + void initScreens(int b, int w, int h); void initVirtScreen(int slot, int number, int top, int width, int height, bool twobufs, bool scrollable); void initBGBuffers(int height); void initCycl(const byte *ptr); // Color cycle diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index ffb7b74942..91768c9d5e 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1019,11 +1019,11 @@ void ScummEngine::scummInit() { debug(9, "scummInit"); if ((_gameId == GID_MANIAC) && (_version == 1)) { - initScreens(0, 16, _screenWidth, 152); + initScreens(16, _screenWidth, 152); } else if (_version >= 7) { - initScreens(0, 0, _screenWidth, _screenHeight); + initScreens(0, _screenWidth, _screenHeight); } else { - initScreens(0, 16, _screenWidth, 144); + initScreens(16, _screenWidth, 144); } for (i = 0; i < 256; i++) |