diff options
| author | Paul Gilbert | 2011-12-13 20:33:45 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-12-13 20:33:45 +1100 |
| commit | d124e25cfe6b022c7030842493065fa91c616bd5 (patch) | |
| tree | e3f5dc23e0bebd1317479bbbd79ed4cc5784caae | |
| parent | 25e42e1baa04013755593db4b46e368e7ff051eb (diff) | |
| download | scummvm-rg350-d124e25cfe6b022c7030842493065fa91c616bd5.tar.gz scummvm-rg350-d124e25cfe6b022c7030842493065fa91c616bd5.tar.bz2 scummvm-rg350-d124e25cfe6b022c7030842493065fa91c616bd5.zip | |
TSAGE: Bugfix to show R2R conversations in front of other on-screen objects
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_speakers.cpp | 9 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_speakers.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp index 8c8bd7171a..cff7334090 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.cpp +++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp @@ -128,7 +128,7 @@ void VisualSpeaker::setText(const Common::String &msg) { //_sceneText.clone(); _sceneText.setPosition(_textPos); - _sceneText.setPriority(0x100); + _sceneText.fixPriority(256); // If subtitles are turned off, don't show the text if (!(R2_GLOBALS._speechSubtitles & SPEECH_TEXT)) { @@ -148,7 +148,7 @@ void VisualSpeaker::setText(const Common::String &msg) { ++numWords; _numFrames = numWords * 30 + 120; - setFrame(_numFrames); + setDelay(_numFrames); } else { _numFrames = 1; } @@ -185,6 +185,11 @@ void VisualSpeaker::setFrame(int numFrames) { _frameNumber = R2_GLOBALS._events.getFrameNumber(); } +void VisualSpeaker::setDelay(int delay) { + _delayAmount = delay; + _frameNumber = R2_GLOBALS._events.getFrameNumber(); +} + /*--------------------------------------------------------------------------*/ SpeakerMiranda300::SpeakerMiranda300(): VisualSpeaker() { diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h index e6a805f31b..b8ad17886a 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.h +++ b/engines/tsage/ringworld2/ringworld2_speakers.h @@ -59,6 +59,8 @@ public: virtual void setText(const Common::String &msg); virtual void proc15() {} virtual void proc16(); + + void setDelay(int delay); }; class SpeakerMiranda300 : public VisualSpeaker { |