[Scummvm-cvs-logs] scummvm master -> 97c5634ec854c521d28d73617a8e91cf9681b2ef

[Strangerke]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d77b93e7f0 TSAGE: Remove useless effect EFFECT_2
97c5634ec8 TSAGE: Fix effect in scene 3150


Commit: d77b93e7f0022b1b6e9d86994b3214b1548b9053
    https://github.com/scummvm/scummvm/commit/d77b93e7f0022b1b6e9d86994b3214b1548b9053
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-05T15:40:25-08:00

Commit Message:
TSAGE: Remove useless effect EFFECT_2

Changed paths:
    engines/tsage/core.h



diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 183af09..05f6f4b 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -467,7 +467,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_2 = 2, EFFECT_3 = 3,
+enum Effect { EFFECT_NONE = 0, EFFECT_SHADED = 1, EFFECT_3 = 3,
 	EFFECT_SHADOW_MAP = 5, EFFECT_SHADED2 = 6 };
 
 class SceneObject;


Commit: 97c5634ec854c521d28d73617a8e91cf9681b2ef
    https://github.com/scummvm/scummvm/commit/97c5634ec854c521d28d73617a8e91cf9681b2ef
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-05T15:40:48-08:00

Commit Message:
TSAGE: Fix effect in scene 3150

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes3.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 3f8f13d..c01980f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -396,7 +396,7 @@ bool Scene3150::LightFixture::startAction(CursorType action, Event &event) {
 		if ((R2_INVENTORY.getObjectScene(R2_LIGHT_BULB) != 3150) && (R2_GLOBALS.getFlag(75))) {
 			R2_GLOBALS._player.disableControl();
 			scene->_bulbOrWire.postInit();
-			scene->_bulbOrWire._effect = EFFECT_3;
+			scene->_bulbOrWire._effect = EFFECT_SHADED2;
 			scene->_bulbOrWire._shade = 5;
 			scene->_sceneMode = 3155;
 			scene->setAction(&scene->_sequenceManager, scene, 3155, &R2_GLOBALS._player, &scene->_bulbOrWire, NULL);