diff options
| author | Travis Howell | 2006-02-28 01:14:02 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-02-28 01:14:02 +0000 |
| commit | 41e7bb67e4fa57e42c36975f3393a34a12afbed0 (patch) | |
| tree | 4fc7aa0cf051b83fd5c7bf4c970c75a6b2d70401 | |
| parent | e1d96cba8757aaf74e85ca2bbbebe4e1adcb3a6d (diff) | |
| download | scummvm-rg350-41e7bb67e4fa57e42c36975f3393a34a12afbed0.tar.gz scummvm-rg350-41e7bb67e4fa57e42c36975f3393a34a12afbed0.tar.bz2 scummvm-rg350-41e7bb67e4fa57e42c36975f3393a34a12afbed0.zip | |
These zakTowns specific changes aren't explained and don't match original code. If problems still occur, add bug reports with details.
svn-id: r20967
| -rw-r--r-- | engines/scumm/script_v5.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index 499d13dabd..2b269ee034 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -466,15 +466,7 @@ void ScummEngine_v5::o5_actorOps() { a->setPalette(i, j); break; case 12: // SO_TALK_COLOR - - // 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); + a->_talkColor = getVarOrDirectByte(PARAM_1); break; case 13: // SO_ACTOR_NAME loadPtrToResource(rtActorName, a->_number, NULL); @@ -1315,12 +1307,7 @@ void ScummEngine_v5::o5_ifClassOfIs() { while ((_opcode = fetchScriptByte()) != 0xFF) { cls = getVarOrDirectWord(PARAM_1); - - 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); - + b = getClass(act, cls); if (cls & 0x80 && !b || !(cls & 0x80) && b) cond = false; } |