diff options
| -rw-r--r-- | scumm/gfx.cpp | 8 | ||||
| -rw-r--r-- | scumm/saveload.cpp | 2 | ||||
| -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 d6e74f5074..bbbdad8360 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -170,7 +170,7 @@ Gdi::Gdi(ScummEngine *vm) { _roomPalette += 16; } -void ScummEngine::initScreens(int b, int w, int h) { +void ScummEngine::initScreens(int b, int h) { int i; for (i = 0; i < 3; i++) { @@ -2264,7 +2264,7 @@ void ScummEngine::transitionEffect(int a) { b = tab_2[i * 4 + 3]; if (t == b) { while (l <= r) { - if (l >= 0 && l < gdi._numStrips && (uint) t < (uint) bottom) { + if (l >= 0 && l < gdi._numStrips && t < bottom) { virtscr[0].tdirty[l] = t * 8; /* //HACK: this is bad place of this hack @@ -2272,10 +2272,10 @@ void ScummEngine::transitionEffect(int a) { //this is only for maniac classic version becouse that game //has bigger height of room gfx layer if ((_version == 1) && (_gameId == GID_MANIAC)) - virtscr[0].bdirty[l] = (t + 2) * 8; + virtscr[0].bdirty[l] = (b + 2) * 8; else */ - virtscr[0].bdirty[l] = (t + 1) * 8; + virtscr[0].bdirty[l] = (b + 1) * 8; } l++; } diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 96fc48d4d4..f01ac4ab52 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -205,7 +205,7 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) { } // Restore the virtual screens and force a fade to black. - initScreens(_screenB, _screenWidth, _screenH); + initScreens(_screenB, _screenH); VirtScreen *vs = &virtscr[0]; memset(vs->screenPtr + vs->xstart, 0, vs->width * vs->height); vs->setDirtyRange(0, vs->height); diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index a8779e8700..38e9fe7f58 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(a, _screenWidth, b); + initScreens(a, 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 6167ccc84a..dc236157a0 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(a, _screenWidth, b); + initScreens(a, b); break; case 175: // SO_ROOM_PALETTE diff --git a/scumm/scumm.h b/scumm/scumm.h index 1690448ade..08fd340b2e 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -789,7 +789,7 @@ protected: StripTable *_roomStrips; - void initScreens(int b, int w, int h); + void initScreens(int b, int h); void initVirtScreen(VirtScreenNumber 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 0e2c0bd501..212768f987 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -997,11 +997,11 @@ void ScummEngine::scummInit() { debug(9, "scummInit"); if ((_gameId == GID_MANIAC) && (_version == 1)) { - initScreens(16, _screenWidth, 152); + initScreens(16, 152); } else if (_version >= 7) { - initScreens(0, _screenWidth, _screenHeight); + initScreens(0, _screenHeight); } else { - initScreens(16, _screenWidth, 144); + initScreens(16, 144); } for (i = 0; i < 256; i++) |