aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld2
diff options
context:
space:
mode:
authorStrangerke2013-11-05 07:18:49 +0100
committerStrangerke2013-11-05 07:18:49 +0100
commite03f0f1e924d238f01d297ef1e7bcdbd264ae2aa (patch)
treea8b291e1458488dd265b9c654e9a597528211cd2 /engines/tsage/ringworld2
parent1d6ed07723f57f27fb4f2a08c0d91835291a05bd (diff)
downloadscummvm-rg350-e03f0f1e924d238f01d297ef1e7bcdbd264ae2aa.tar.gz
scummvm-rg350-e03f0f1e924d238f01d297ef1e7bcdbd264ae2aa.tar.bz2
scummvm-rg350-e03f0f1e924d238f01d297ef1e7bcdbd264ae2aa.zip
TSAGE: R2R - Rename Effect 5
Diffstat (limited to 'engines/tsage/ringworld2')
-rw-r--r--engines/tsage/ringworld2/ringworld2_logic.cpp2
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp19
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes3.cpp4
3 files changed, 13 insertions, 12 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index b3ea27018d..5cda153e59 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1329,7 +1329,7 @@ GfxSurface SceneActor::getFrame() {
// TODO: Proper effects handling
switch (_effect) {
case EFFECT_NONE:
- case EFFECT_5:
+ case EFFECT_SHADOW:
// TODO: Figure out purpose of setting image flags to 64, and getting
// scene priorities -1 or _shade
break;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 2d6ff30d26..1247000cd2 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -868,7 +868,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
_palette1.loadPalette(1101);
R2_GLOBALS._player.postInit();
R2_GLOBALS._player.disableControl();
- R2_GLOBALS._player._effect = EFFECT_5;
+ R2_GLOBALS._player._effect = EFFECT_SHADOW;
R2_GLOBALS._player._shadowMap = _shadowPaletteMap;
R2_GLOBALS._player.setup(1102, 3, 2);
R2_GLOBALS._player.setObjectWrapper(NULL);
@@ -894,7 +894,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
_shipFormationShadow.setup(1102, 6, 2);
_shipFormationShadow._moveRate = 30;
_shipFormationShadow._moveDiff.x = 2;
- _shipFormationShadow._effect = EFFECT_5;
+ _shipFormationShadow._effect = EFFECT_SHADOW;
_shipFormationShadow._shadowMap = _shadowPaletteMap;
R2_GLOBALS._sound1.play(86);
@@ -1084,7 +1084,8 @@ void Scene1100::signal() {
case 11: {
setAction(&_sequenceManager1, this, 1106, &_animation, &_laserShot, &_leftImpacts, NULL);
- R2_GLOBALS._player._effect = EFFECT_5;
+ // CHECKME: Shadow effect should be set next to shadowmap
+ R2_GLOBALS._player._effect = EFFECT_SHADOW;
R2_GLOBALS._player.setup(1102, 3, 2);
R2_GLOBALS._player.setPosition(Common::Point(-50, 131));
R2_GLOBALS._sound2.play(84);
@@ -6908,7 +6909,7 @@ void Scene1500::postInit(SceneObjectList *OwnerList) {
_starshipShadow.postInit();
_starshipShadow.setup(1401, 1, 1);
- _starshipShadow._effect = EFFECT_5;
+ _starshipShadow._effect = EFFECT_SHADOW;
_starshipShadow.fixPriority(10);
_starshipShadow._shadowMap = _shadowPaletteMap;
@@ -6920,7 +6921,7 @@ void Scene1500::postInit(SceneObjectList *OwnerList) {
if (R2_GLOBALS._sceneManager._previousScene != 1010) {
_smallShipShadow.postInit();
_smallShipShadow.setup(1401, 2, 1);
- _smallShipShadow._effect = EFFECT_5;
+ _smallShipShadow._effect = EFFECT_SHADOW;
_smallShipShadow.fixPriority(10);
_smallShipShadow._shadowMap = _shadowPaletteMap;
@@ -10577,7 +10578,7 @@ void Scene1700::postInit(SceneObjectList *OwnerList) {
else
_actor1.setVisage(1111);
- _actor1._effect = EFFECT_5;
+ _actor1._effect = EFFECT_SHADOW;
_actor1._shadowMap = _shadowPaletteMap;
R2_GLOBALS._player._linkedActor = &_actor1;
@@ -10588,7 +10589,7 @@ void Scene1700::postInit(SceneObjectList *OwnerList) {
else
_actor2.setVisage(1112);
- _actor2._effect = EFFECT_5;
+ _actor2._effect = EFFECT_SHADOW;
_actor2._shadowMap = _shadowPaletteMap;
_actor12._linkedActor = &_actor2;
@@ -11526,7 +11527,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
else
_playerShadow.setVisage(1110);
- _playerShadow._effect = EFFECT_5;
+ _playerShadow._effect = EFFECT_SHADOW;
_playerShadow._shadowMap = _shadowPaletteMap;
R2_GLOBALS._player._linkedActor = &_playerShadow;
@@ -11538,7 +11539,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
else
_companionShadow.setVisage(1111);
- _companionShadow._effect = EFFECT_5;
+ _companionShadow._effect = EFFECT_SHADOW;
_companionShadow._shadowMap = _shadowPaletteMap;
_companion._linkedActor = &_companionShadow;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 5764036355..dd01c3d8d9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -5208,7 +5208,7 @@ void Scene3800::enterArea() {
_balloonQuinn.fixPriority(10);
_balloonQuinn.changeZoom(-1);
_balloonQuinn.setVisage(1110);
- _balloonQuinn._effect = EFFECT_5;
+ _balloonQuinn._effect = EFFECT_SHADOW;
_balloonQuinn._shadowMap = this->_shadowPaletteMap;
R2_GLOBALS._player._linkedActor = &_balloonQuinn;
switch (R2_GLOBALS._sceneManager._previousScene) {
@@ -5518,7 +5518,7 @@ void Scene3900::postInit(SceneObjectList *OwnerList) {
_linkedQuinn.fixPriority(10);
_linkedQuinn.changeZoom(-1);
_linkedQuinn.setVisage(1110);
- _linkedQuinn._effect = EFFECT_5;
+ _linkedQuinn._effect = EFFECT_SHADOW;
_linkedQuinn._shadowMap = _shadowPaletteMap;
R2_GLOBALS._player._linkedActor = &_linkedQuinn;