diff options
| author | Paul Gilbert | 2011-04-25 21:41:13 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-04-25 21:41:13 +1000 |
| commit | 836f99e2ef04a2b35846ef0e9ff5781652b3c295 (patch) | |
| tree | b8f96aa077dbc19f9d2cf33b824b0a28e6bb16ad /engines/tsage | |
| parent | c17f200ccf70bc6c6d6762383197b19999175ccf (diff) | |
| download | scummvm-rg350-836f99e2ef04a2b35846ef0e9ff5781652b3c295.tar.gz scummvm-rg350-836f99e2ef04a2b35846ef0e9ff5781652b3c295.tar.bz2 scummvm-rg350-836f99e2ef04a2b35846ef0e9ff5781652b3c295.zip | |
TSAGE: Bugfixes for Ringworld demo - demo is now completable with some remaining gfx glitches
Diffstat (limited to 'engines/tsage')
| -rw-r--r-- | engines/tsage/converse.cpp | 14 | ||||
| -rw-r--r-- | engines/tsage/ringworld_demo.cpp | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp index 8d0262485b..be072c37f8 100644 --- a/engines/tsage/converse.cpp +++ b/engines/tsage/converse.cpp @@ -244,6 +244,7 @@ void SequenceManager::signal() { } case 28: _objectIndex = getNextValue(); + assert((_objectIndex >= 0) && (_objectIndex < 6)); _sceneObject = _objectList[_objectIndex]; assert(_sceneObject); break; @@ -272,14 +273,15 @@ void SequenceManager::signal() { case 34: { v1 = getNextValue(); v2 = getNextValue(); - int objIndex1 = getNextValue(); - int objIndex2 = getNextValue(); - int objIndex3 = getNextValue(); - int objIndex4 = getNextValue(); - int objIndex5 = getNextValue(); + int objIndex1 = getNextValue() - 1; + int objIndex2 = getNextValue() - 1; + int objIndex3 = getNextValue() - 1; + int objIndex4 = getNextValue() - 1; + int objIndex5 = getNextValue() - 1; + int objIndex6 = getNextValue() - 1; setAction(globalManager(), v2 ? this : NULL, v1, _objectList[objIndex1], _objectList[objIndex2], - _objectList[objIndex3], _objectList[objIndex4], _objectList[objIndex5]); + _objectList[objIndex3], _objectList[objIndex4], _objectList[objIndex5], _objectList[objIndex6], NULL); break; } default: diff --git a/engines/tsage/ringworld_demo.cpp b/engines/tsage/ringworld_demo.cpp index 3f87e8d342..29438c0347 100644 --- a/engines/tsage/ringworld_demo.cpp +++ b/engines/tsage/ringworld_demo.cpp @@ -43,7 +43,7 @@ void RingworldDemoScene::signal() { _soundHandler.startSound(4); _actor1.postInit(); _actor2.postInit(); - _actor1.postInit(); + _actor3.postInit(); _actor4.postInit(); _actor5.postInit(); _actor6.postInit(); |