thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source 
svn-id: r8203
This commit is contained in:
Max Horn 2003-06-01 00:45:08 +00:00
parent 5e46155d3a
commit 24b5af6a0e
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scumm/script_v6.cpp
View file

@ -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() {