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

Fix the BUN string parser. Doesn't crash other games anymore :)

Browse source 
svn-id: r3896
This commit is contained in:
James Brown 2002-04-09 06:46:24 +00:00
parent 011cf6e066
commit 0313be280a
1 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

53
script_v2.cpp
View file

@ -2354,19 +2354,17 @@ void Scumm::o6_printEgo() {
} }
void Scumm::o6_talkActor() { void Scumm::o6_talkActor() {
char *pointer = NULL, *string = NULL;
_actorToPrintStrFor = pop(); _actorToPrintStrFor = pop();
pointer = string = (char *)_scriptPointer; _messagePtr = _scriptPointer;
pointer = strtok(pointer, "/");
if (pointer) {
playBundleSound(pointer);
pointer = strtok(NULL, "");
_messagePtr = (unsigned char *)pointer;
} else {
_messagePtr = (unsigned char *)string;
}
if (_scriptPointer[0] == '/') {
char *pointer = strtok((char *)_scriptPointer, "/");
int bunsize = strlen(pointer) + 2;
playBundleSound(pointer);
_scriptPointer += bunsize;
_messagePtr = _scriptPointer;
}
setStringVars(0); setStringVars(0);
actorTalk(); actorTalk();
_scriptPointer = _messagePtr; _scriptPointer = _messagePtr;
@ -2375,6 +2373,15 @@ void Scumm::o6_talkActor() {
void Scumm::o6_talkEgo() { void Scumm::o6_talkEgo() {
_actorToPrintStrFor = (unsigned char)_vars[VAR_EGO]; _actorToPrintStrFor = (unsigned char)_vars[VAR_EGO];
_messagePtr = _scriptPointer; _messagePtr = _scriptPointer;
if (_scriptPointer[0] == '/') {
char *pointer = strtok((char *)_scriptPointer, "/");
int bunsize = strlen(pointer) + 2;
playBundleSound(pointer);
_scriptPointer += bunsize;
_messagePtr = _scriptPointer;
}
setStringVars(0); setStringVars(0);
actorTalk(); actorTalk();
_scriptPointer = _messagePtr; _scriptPointer = _messagePtr;
@ -2826,18 +2833,26 @@ void Scumm::decodeParseString2(int m, int n) {
case 74: case 74:
string[m].no_talk_anim = true; string[m].no_talk_anim = true;
break; break;
case 75: case 75: {
_messagePtr = _scriptPointer; _messagePtr = _scriptPointer;
if (_scriptPointer[0] == '/') {
char *pointer = strtok((char *)_scriptPointer, "/");
int bunsize = strlen(pointer) + 2;
playBundleSound(pointer);
_scriptPointer += bunsize;
_messagePtr = _scriptPointer;
}
switch(m) { switch(m) {
case 0: actorTalk(); break; case 0: actorTalk(); break;
case 1: drawString(1); break; case 1: drawString(1); break;
case 2: unkMessage1(); break;
case 2: unkMessage1(); break; case 3: unkMessage2(); break;
case 3: unkMessage2(); break;
} }
_scriptPointer = _messagePtr; _scriptPointer = _messagePtr;
return; return;
}
case 0xFE: case 0xFE:
setStringVars(m); setStringVars(m);
if (n) if (n)