diff options
| author | Max Horn | 2003-06-01 00:45:08 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-01 00:45:08 +0000 |
| commit | 24b5af6a0e22c4e1f1569714d61f3be47b575112 (patch) | |
| tree | 4e50e93c908cd9c0a59ad0bc006f185fc8a06b35 | |
| parent | 5e46155d3add5bcfe1a8f9378f2e6d21abbe90e2 (diff) | |
| download | scummvm-rg350-24b5af6a0e22c4e1f1569714d61f3be47b575112.tar.gz scummvm-rg350-24b5af6a0e22c4e1f1569714d61f3be47b575112.tar.bz2 scummvm-rg350-24b5af6a0e22c4e1f1569714d61f3be47b575112.zip | |
cleanup
svn-id: r8203
| -rw-r--r-- | scumm/script_v6.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 63766119a0..f3c13ff44b 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2219,15 +2219,15 @@ void Scumm_v6::o6_printEgo() { void Scumm_v6::o6_talkActor() { _actorToPrintStrFor = pop(); + _messagePtr = _scriptPointer; + _scriptPointer += resStrLen(_scriptPointer) + 1; if (((_gameId == GID_DIG) || (_features & GF_AFTER_V8)) && (_messagePtr[0] == '/')) { char pointer[20]; int i, j; - _scriptPointer += resStrLen(_scriptPointer) + 1; translateText(_messagePtr, _transText); - for (i = 0, j = 0; (_messagePtr[i] != '/' || j == 0) && j < 19; i++) { if (_messagePtr[i] != '/') pointer[j++] = _messagePtr[i]; @@ -2240,13 +2240,10 @@ void Scumm_v6::o6_talkActor() { _sound->_talkChannel = _sound->playBundleSound(pointer); _messagePtr = _transText; - setStringVars(0); - actorTalk(); - } else { - setStringVars(0); - actorTalk(); - _scriptPointer = _messagePtr; } + + setStringVars(0); + actorTalk(); } void Scumm_v6::o6_talkEgo() { |