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

These zakTowns specific changes aren't explained and don't match original code. If problems still occur, add bug reports with details.

Browse source 
svn-id: r20967
This commit is contained in:
Travis Howell 2006-02-28 01:14:02 +00:00
parent e1d96cba87
commit 41e7bb67e4
1 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
engines/scumm/script_v5.cpp
View file

@ -466,15 +466,7 @@ void ScummEngine_v5::o5_actorOps() {
a->setPalette(i, j); a->setPalette(i, j);
break; break;
case 12: // SO_TALK_COLOR case 12: // SO_TALK_COLOR
a->_talkColor = getVarOrDirectByte(PARAM_1);
// Zak256 (and possibly other games) uses actor 0 to
// indicate that it's the default talk color that is
// to be changed.
if (act == 0)
_string[0].color = getVarOrDirectByte(PARAM_1);
else
a->_talkColor = getVarOrDirectByte(PARAM_1);
break; break;
case 13: // SO_ACTOR_NAME case 13: // SO_ACTOR_NAME
loadPtrToResource(rtActorName, a->_number, NULL); loadPtrToResource(rtActorName, a->_number, NULL);
@ -1315,12 +1307,7 @@ void ScummEngine_v5::o5_ifClassOfIs() {
while ((_opcode = fetchScriptByte()) != 0xFF) { while ((_opcode = fetchScriptByte()) != 0xFF) {
cls = getVarOrDirectWord(PARAM_1); cls = getVarOrDirectWord(PARAM_1);
b = getClass(act, cls);
if (!cls) // FIXME: Ender can't remember why this is here,
b = false; // but it fixes an oddball zak256 crash
else
b = getClass(act, cls);
if (cls & 0x80 && !b || !(cls & 0x80) && b) if (cls & 0x80 && !b || !(cls & 0x80) && b)
cond = false; cond = false;
} }