diff options
| author | D G Turner | 2012-07-08 01:08:15 +0100 |
|---|---|---|
| committer | D G Turner | 2012-07-08 01:08:15 +0100 |
| commit | aec83e015cad4e2fc329c5bedc7559e07ed40084 (patch) | |
| tree | 31278ec62b434a7c73a40ede9b24983dc728884b /engines/teenagent/scene.cpp | |
| parent | 0e6ba29ede4d5d226e1d81ac5c3174dcab7a48f1 (diff) | |
| download | scummvm-rg350-aec83e015cad4e2fc329c5bedc7559e07ed40084.tar.gz scummvm-rg350-aec83e015cad4e2fc329c5bedc7559e07ed40084.tar.bz2 scummvm-rg350-aec83e015cad4e2fc329c5bedc7559e07ed40084.zip | |
TEENAGENT: Replaced non-const static variable in Scene class.
This could cause glitches with Return To Launcher and thus should be
avoided. Replaced with a private member variable on the class.
Diffstat (limited to 'engines/teenagent/scene.cpp')
| -rw-r--r-- | engines/teenagent/scene.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp index aca29cc9fb..c26c10d13c 100644 --- a/engines/teenagent/scene.cpp +++ b/engines/teenagent/scene.cpp @@ -44,6 +44,7 @@ Scene::Scene(TeenAgentEngine *vm) : _vm(vm), intro(false), _id(0), ons(0), current_event(SceneEvent::kNone), hide_actor(false), callback(0), callback_timer(0), _idle_timer(0) { _fade_timer = 0; + _fadeOld = 0; on_enabled = true; memset(palette, 0, sizeof(palette)); @@ -734,15 +735,13 @@ bool Scene::render(bool tick_game, bool tick_mark, uint32 delta) { } else if (!hide_actor) { actor_animation.free(); uint zoom = lookupZoom(position.y); - { - byte fade = findFade(); - static byte old_fade = 0; - if (fade != old_fade) { - old_fade = fade; - paletteEffect(fade); - if (_fade_timer == 0) - setPalette(4); - } + + byte fade = findFade(); + if (fade != _fadeOld) { + _fadeOld = fade; + paletteEffect(fade); + if (_fade_timer == 0) + setPalette(4); } if (!path.empty()) { |