diff options
| author | Paul Gilbert | 2011-03-21 23:42:16 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-03-21 23:42:16 +1100 |
| commit | 66ad86397ea08c00a30ae0bc7863b0b655498d57 (patch) | |
| tree | c5d9d4db6babfbfedd878f2b2c22b8128ec8ee99 | |
| parent | 4c765a0e6438e872c6c773244911ed046b936877 (diff) | |
| download | scummvm-rg350-66ad86397ea08c00a30ae0bc7863b0b655498d57.tar.gz scummvm-rg350-66ad86397ea08c00a30ae0bc7863b0b655498d57.tar.bz2 scummvm-rg350-66ad86397ea08c00a30ae0bc7863b0b655498d57.zip | |
TSAGE: Bugfixes for animations in Scene #4000
| -rw-r--r-- | engines/tsage/core.cpp | 4 | ||||
| -rw-r--r-- | engines/tsage/ringworld_logic.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/ringworld_scenes5.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index 28c0e038a1..6677026f32 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -1675,7 +1675,7 @@ void SceneObject::setPosition(const Common::Point &p, int yDiff) { } void SceneObject::setZoom(int percent) { - assert(_percent >= 0); + assert((percent >= -1) && (percent < 999)); if (percent != _percent) { _percent = percent; _flags |= OBJFLAG_PANES; @@ -2093,7 +2093,7 @@ void SceneObject::dispatch() { // Handle updating the zoom and/or priority if (!(_flags & OBJFLAG_ZOOMED)) { - int yp = MIN((int)_position.y, 255); + int yp = CLIP((int)_position.y, 0, 255); setZoom(_globals->_sceneManager._scene->_zoomPercents[yp]); } if (!(_flags & OBJFLAG_FIXED_PRIORITY)) { diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp index 4793f70c6c..e42b11208a 100644 --- a/engines/tsage/ringworld_logic.cpp +++ b/engines/tsage/ringworld_logic.cpp @@ -360,7 +360,7 @@ SpeakerPText::SpeakerPText() { /*--------------------------------------------------------------------------*/ SpeakerCHFText::SpeakerCHFText() { - _speakerName = "SpeakerCHFText"; + _speakerName = "CHFTEXT"; _textWidth = 240; _textMode = ALIGN_CENTRE; _colour1 = 56; diff --git a/engines/tsage/ringworld_scenes5.cpp b/engines/tsage/ringworld_scenes5.cpp index 400e2f7977..9e703b5cb9 100644 --- a/engines/tsage/ringworld_scenes5.cpp +++ b/engines/tsage/ringworld_scenes5.cpp @@ -609,7 +609,7 @@ void Scene4000::postInit(SceneObjectList *OwnerList) { } else { _globals->_player.disableControl(); _sceneMode = 4001; - setAction(&_sequenceManager1, this, &_globals->_player, NULL); + setAction(&_sequenceManager1, this, 4001, &_globals->_player, NULL); if (!_globals->getFlag(36) && !_globals->getFlag(43)) _hotspot7.setAction(&_sequenceManager2, NULL, 4002, &_hotspot7, NULL); @@ -636,6 +636,8 @@ void Scene4000::postInit(SceneObjectList *OwnerList) { _hotspot2._numFrames = 5; _hotspot2.setPosition(Common::Point(182, 146)); _hotspot2.setAction(&_action10); + + setAction(&_action2); break; case 4025: |