diff options
author | Strangerke | 2014-02-06 08:19:49 +0100 |
---|---|---|
committer | Strangerke | 2014-02-06 08:19:49 +0100 |
commit | a446968b105a83951192cc7a2d730e41ebae07db (patch) | |
tree | 2f4056e19b9b4c36702daa00db93f14fb8d312e4 /engines | |
parent | 4df0a42eead1b2f644db1f10272d5153ebcc68a1 (diff) | |
download | scummvm-rg350-a446968b105a83951192cc7a2d730e41ebae07db.tar.gz scummvm-rg350-a446968b105a83951192cc7a2d730e41ebae07db.tar.bz2 scummvm-rg350-a446968b105a83951192cc7a2d730e41ebae07db.zip |
TSAGE: R2R - rename EFFECT_3
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/core.h | 2 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/tsage/core.h b/engines/tsage/core.h index c285fba669..6e50cc8d2e 100644 --- a/engines/tsage/core.h +++ b/engines/tsage/core.h @@ -465,7 +465,7 @@ enum AnimateMode {ANIM_MODE_NONE = 0, ANIM_MODE_1 = 1, ANIM_MODE_2 = 2, ANIM_MOD }; // Actor effect enumeration used in Return to Ringworld 2 -enum Effect { EFFECT_NONE = 0, EFFECT_SHADED = 1, EFFECT_3 = 3, +enum Effect { EFFECT_NONE = 0, EFFECT_SHADED = 1, EFFECT_SMOKE = 3, EFFECT_SHADOW_MAP = 5, EFFECT_SHADED2 = 6 }; class SceneObject; diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index f82204b1e9..9e02fb8a5d 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -5858,7 +5858,7 @@ bool Scene600::Laser::startAction(CursorType action, Event &event) { scene->_smoke.postInit(); scene->_smoke.setup(601, 3, 1); - scene->_smoke._effect = EFFECT_3; + scene->_smoke._effect = EFFECT_SMOKE; scene->_smoke._moveDiff = Common::Point(1, 1); scene->_smoke._moveRate = 2; scene->_smoke._numFrames = 3; @@ -6039,7 +6039,7 @@ void Scene600::postInit(SceneObjectList *OwnerList) { _smoke._numFrames = 3; _smoke.animate(ANIM_MODE_2, NULL); _smoke.fixPriority(130); - _smoke._effect = EFFECT_3; + _smoke._effect = EFFECT_SMOKE; _smoke.setDetails(600, 24, 25, 26, 1, (SceneItem *) NULL); _smoke.signal(); } @@ -6110,7 +6110,7 @@ void Scene600::signal() { R2_INVENTORY.setObjectScene(R2_AEROSOL, 600); R2_GLOBALS.setFlag(5); - _smoke._effect = EFFECT_3; + _smoke._effect = EFFECT_SMOKE; _smoke.signal(); break; case 606: |