diff options
| author | Travis Howell | 2006-03-14 12:06:37 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-03-14 12:06:37 +0000 |
| commit | be7a28f65e35b8e8a7c8e60c9b0bcb1923a3d942 (patch) | |
| tree | d5d6a02759ddcb0e4b4cbfefefb0ef90eeb98385 /engines/scumm/scumm.cpp | |
| parent | 806ee522d12af62720d1870528b28293934a113a (diff) | |
| download | scummvm-rg350-be7a28f65e35b8e8a7c8e60c9b0bcb1923a3d942.tar.gz scummvm-rg350-be7a28f65e35b8e8a7c8e60c9b0bcb1923a3d942.tar.bz2 scummvm-rg350-be7a28f65e35b8e8a7c8e60c9b0bcb1923a3d942.zip | |
Avoid all scumm var conflicts in C64 maniac
svn-id: r21277
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 58b9c97dd7..65a60d1686 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -636,6 +636,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _scrollBuffer = NULL; _doEffect = false; + _currentLights = 0; memset(&_flashlight, 0, sizeof(_flashlight)); _bompActorPalettePtr = NULL; _shakeEnabled = false; @@ -1454,7 +1455,7 @@ void ScummEngine::scummInit() { virtscr[0].xstart = 0; - if (VAR_CURRENT_LIGHTS != 0xFF) { + if (_game.version <= 5) { // Setup light _flashlight.xStrips = 7; _flashlight.yStrips = 7; @@ -2059,9 +2060,9 @@ load_game: setActorRedrawFlags(); resetActorBgs(); - if (VAR_CURRENT_LIGHTS != 0xFF && - !(VAR(VAR_CURRENT_LIGHTS) & LIGHTMODE_screen) && - VAR(VAR_CURRENT_LIGHTS) & LIGHTMODE_flashlight) { + if (_game.version <= 5 && + !(getCurrentLights() & LIGHTMODE_screen) && + getCurrentLights() & LIGHTMODE_flashlight) { drawFlashlight(); setActorRedrawFlags(); } @@ -2128,7 +2129,7 @@ load_game: if (VAR_TIMER != 0xFF) VAR(VAR_TIMER) = 0; - return VAR(VAR_TIMER_NEXT); + return (VAR_TIMER_NEXT != 0xFF) ? VAR(VAR_TIMER_NEXT) : 4; } |