diff options
| author | Paul Gilbert | 2011-10-25 20:45:38 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-10-26 20:13:05 +1100 |
| commit | 9ccb2eea32e4b85394295f4eed9884f05bf75c08 (patch) | |
| tree | d2bd36dce81cd8ba38a7c6029b519e57d9c4e6a1 /engines/tsage/ringworld2 | |
| parent | ac559b0212c21c7f4a3a10455b8dff211d7ebb87 (diff) | |
| download | scummvm-rg350-9ccb2eea32e4b85394295f4eed9884f05bf75c08.tar.gz scummvm-rg350-9ccb2eea32e4b85394295f4eed9884f05bf75c08.tar.bz2 scummvm-rg350-9ccb2eea32e4b85394295f4eed9884f05bf75c08.zip | |
TSAGE: Added R2 _shade and _effect fields to scene objects class.
Diffstat (limited to 'engines/tsage/ringworld2')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_logic.cpp | 3 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_logic.h | 1 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp index ce29ae7235..d033627ae9 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.cpp +++ b/engines/tsage/ringworld2/ringworld2_logic.cpp @@ -690,9 +690,6 @@ void SceneActor::synchronize(Serializer &s) { s.syncAsSint16LE(_lookLineNum); s.syncAsSint16LE(_talkLineNum); s.syncAsSint16LE(_useLineNum); - - s.syncAsSint16LE(_effect); - s.syncAsSint16LE(_shade); } bool SceneActor::startAction(CursorType action, Event &event) { diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h index 13f230c78f..b12978344c 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.h +++ b/engines/tsage/ringworld2/ringworld2_logic.h @@ -219,7 +219,6 @@ class SceneActor: public SceneObject { public: int _resNum; int _lookLineNum, _talkLineNum, _useLineNum; - int _effect, _shade; virtual Common::String getClassName() { return "SceneActor"; } virtual void synchronize(Serializer &s); diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 004c6c2b2b..edc3f06aa2 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -316,14 +316,13 @@ void Scene100::signal() { } void Scene100::dispatch() { -/* int regionIndex = R2_GLOBALS._player.getRegionIndex(); if (regionIndex == 13) R2_GLOBALS._player._shade = 4; if ((R2_GLOBALS._player._visage == 13) || (R2_GLOBALS._player._visage == 101)) - (R2_GLOBALS._player._shade = 0; -*/ + R2_GLOBALS._player._shade = 0; + SceneExt::dispatch(); if ((_sceneMode == 101) && (_object7._frame == 2) && (_table._strip == 5)) { |