diff options
| author | Paul Gilbert | 2011-12-12 22:07:38 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-12-12 22:07:38 +1100 |
| commit | 18cfbc6c2da9a55ac4ead063348e264f50924075 (patch) | |
| tree | 9144b973d1239a63763061b77efd3014838aa494 /engines/tsage/ringworld2/ringworld2_speakers.cpp | |
| parent | 546c6a07e4803541647ad18d69c650fdd4cf974c (diff) | |
| download | scummvm-rg350-18cfbc6c2da9a55ac4ead063348e264f50924075.tar.gz scummvm-rg350-18cfbc6c2da9a55ac4ead063348e264f50924075.tar.bz2 scummvm-rg350-18cfbc6c2da9a55ac4ead063348e264f50924075.zip | |
TSAGE: Bugfixes and extra commenting for R2R conversation display
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_speakers.cpp')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_speakers.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp index 7f39e3d630..8c8bd7171a 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.cpp +++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp @@ -110,7 +110,7 @@ void VisualSpeaker::setText(const Common::String &msg) { Common::String s = msg; if (s.hasPrefix("!")) { s.deleteChar(0); - _soundId = atoi(msg.c_str()); + _soundId = atoi(s.c_str()); while (!s.empty() && (*s.c_str() >= '0' && *s.c_str() <= '9')) s.deleteChar(0); @@ -123,7 +123,7 @@ void VisualSpeaker::setText(const Common::String &msg) { _sceneText._width = _textWidth; _sceneText._fontNumber = _fontNumber; _sceneText._textMode = _textMode; - _sceneText.setup(msg); + _sceneText.setup(s); //_sceneText.clone(); @@ -131,12 +131,12 @@ void VisualSpeaker::setText(const Common::String &msg) { _sceneText.setPriority(0x100); // If subtitles are turned off, don't show the text - if (!(R2_GLOBALS._speechSubtitles & 1)) { + if (!(R2_GLOBALS._speechSubtitles & SPEECH_TEXT)) { _sceneText.hide(); } // Figure out the text delay if subtitles are turned on, or there's no speech resource specified - if ((R2_GLOBALS._speechSubtitles & 1) || !_soundId) { + if ((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) || !_soundId) { const char *msgP = s.c_str(); int numWords = 0; while (*msgP != '\0') { @@ -159,10 +159,10 @@ void VisualSpeaker::setText(const Common::String &msg) { if (_fieldF6) { - if ((R2_GLOBALS._speechSubtitles & 1) || !_soundId) + if ((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) || !_soundId) _sceneText.hide(); } else { - if ((R2_GLOBALS._speechSubtitles & 2) && _soundId) { + if ((R2_GLOBALS._speechSubtitles & SPEECH_VOICE) && _soundId) { if (!R2_GLOBALS._playStream.play(_soundId, NULL)) _sceneText.show(); } |