diff options
author | Max Horn | 2002-08-20 02:13:41 +0000 |
---|---|---|
committer | Max Horn | 2002-08-20 02:13:41 +0000 |
commit | 79e1c9cdf824314331206c23d211b8acb4801a86 (patch) | |
tree | 012eed0400d70543a4f842e0b51e51cdb06bdb27 | |
parent | 10d0c6b4d2efe10b966737adbf79ffa5a4c4f046 (diff) | |
download | scummvm-rg350-79e1c9cdf824314331206c23d211b8acb4801a86.tar.gz scummvm-rg350-79e1c9cdf824314331206c23d211b8acb4801a86.tar.bz2 scummvm-rg350-79e1c9cdf824314331206c23d211b8acb4801a86.zip |
cleanup
svn-id: r4776
-rw-r--r-- | scummvm.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/scummvm.cpp b/scummvm.cpp index d9275900ba..d227534e78 100644 --- a/scummvm.cpp +++ b/scummvm.cpp @@ -425,23 +425,18 @@ int Scumm::scummLoop(int delta) moveCamera(); fixObjectFlags(); CHARSET_1(); - if (!(_features & GF_AFTER_V7)) { - if (camera._cur.x != camera._last.x || _BgNeedsRedraw || _fullRedraw) { - redrawBGAreas(); - } - } else { - if (camera._cur.x != camera._last.x || camera._cur.y != camera._last.y - || _BgNeedsRedraw || _fullRedraw) { - redrawBGAreas(); - } + + if (camera._cur.x != camera._last.x || _BgNeedsRedraw || _fullRedraw + || (_features & GF_AFTER_V7 && camera._cur.y != camera._last.y)) { + redrawBGAreas(); } + processDrawQue(); setActorRedrawFlags(); resetActorBgs(); if (!(_vars[VAR_CURRENT_LIGHTS] & LIGHTMODE_screen) && _vars[VAR_CURRENT_LIGHTS] & LIGHTMODE_flashlight) { - warning("Flashlight not implemented in this version"); drawFlashlight(); setActorRedrawFlags(); } |