diff options
| author | Strangerke | 2014-02-06 08:09:35 +0100 |
|---|---|---|
| committer | Strangerke | 2014-02-06 08:10:11 +0100 |
| commit | 4df0a42eead1b2f644db1f10272d5153ebcc68a1 (patch) | |
| tree | 4cdde19c528c1d10dd415de72a1f96f853dae6f0 /engines/tsage/ringworld2 | |
| parent | a231d6c7d2a28a92830a347cee1654a97da4ca59 (diff) | |
| download | scummvm-rg350-4df0a42eead1b2f644db1f10272d5153ebcc68a1.tar.gz scummvm-rg350-4df0a42eead1b2f644db1f10272d5153ebcc68a1.tar.bz2 scummvm-rg350-4df0a42eead1b2f644db1f10272d5153ebcc68a1.zip | |
TSAGE: R2R - Get rid of some magic values
Diffstat (limited to 'engines/tsage/ringworld2')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 99948b68ba..f82204b1e9 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -5768,7 +5768,7 @@ bool Scene600::Smoke::startAction(CursorType action, Event &event) { GfxSurface Scene600::Smoke::getFrame() { GfxSurface frame = SceneActor::getFrame(); - if (_effect) { + if (_effect != EFFECT_NONE) { // Translate the frame using the scene's pixel map byte *pixelMap = static_cast<Scene600 *>(R2_GLOBALS._sceneManager._scene)->_pixelMap; Graphics::Surface surface = frame.lockSurface(); diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index e55ae8ff70..f2bb68480d 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -1275,7 +1275,7 @@ void Scene3250::signal() { } void Scene3250::dispatch() { - if ((R2_GLOBALS._player._visage == 3250) && (R2_GLOBALS._player._strip == 3) && (R2_GLOBALS._player._effect == 0)) { + if ((R2_GLOBALS._player._visage == 3250) && (R2_GLOBALS._player._strip == 3) && (R2_GLOBALS._player._effect == EFFECT_NONE)) { R2_GLOBALS._player._effect = EFFECT_SHADED2; R2_GLOBALS._player._shade = 6; } @@ -2221,24 +2221,24 @@ void Scene3375::signal() { } void Scene3375::dispatch() { - if ((R2_GLOBALS._player._position.y >= 168) && (R2_GLOBALS._player._effect == 1)) + if ((R2_GLOBALS._player._position.y >= 168) && (R2_GLOBALS._player._effect == EFFECT_SHADED)) R2_GLOBALS._player._effect = EFFECT_SHADED2; - else if ((R2_GLOBALS._player._position.y < 168) && (R2_GLOBALS._player._effect == 6)) + else if ((R2_GLOBALS._player._position.y < 168) && (R2_GLOBALS._player._effect == EFFECT_SHADED2)) R2_GLOBALS._player._effect = EFFECT_SHADED; - if ((_companion1._position.y >= 168) && (_companion1._effect == 1)) + if ((_companion1._position.y >= 168) && (_companion1._effect == EFFECT_SHADED)) _companion1._effect = EFFECT_SHADED2; - else if ((_companion1._position.y < 168) && (_companion1._effect == 6)) + else if ((_companion1._position.y < 168) && (_companion1._effect == EFFECT_SHADED2)) _companion1._effect = EFFECT_SHADED; - if ((_companion2._position.y >= 168) && (_companion2._effect == 1)) + if ((_companion2._position.y >= 168) && (_companion2._effect == EFFECT_SHADED)) _companion2._effect = EFFECT_SHADED2; - else if ((_companion2._position.y < 168) && (_companion2._effect == 6)) + else if ((_companion2._position.y < 168) && (_companion2._effect == EFFECT_SHADED2)) _companion2._effect = EFFECT_SHADED; - if ((_webbster._position.y >= 168) && (_webbster._effect == 1)) + if ((_webbster._position.y >= 168) && (_webbster._effect == EFFECT_SHADED)) _webbster._effect = EFFECT_SHADED2; - else if ((_webbster._position.y < 168) && (_webbster._effect == 6)) + else if ((_webbster._position.y < 168) && (_webbster._effect == EFFECT_SHADED2)) _webbster._effect = EFFECT_SHADED; Scene::dispatch(); |