libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: R2R - Get rid of some magic values

Browse Source
This commit is contained in:
Strangerke 2014-02-06 08:09:35 +01:00
parent a231d6c7d2
commit 4df0a42eea
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/tsage/ringworld2/ringworld2_scenes0.cpp
View File

@ -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();

18
engines/tsage/ringworld2/ringworld2_scenes3.cpp
View File

@ -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();