diff options
| author | Max Horn | 2003-05-20 23:05:34 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-20 23:05:34 +0000 |
| commit | 34eee8b33bb1295f1872b8752d904df68133ad4c (patch) | |
| tree | 0d983dc1c018eeae71487b383a2e87d0c12e37a7 /scumm/script_v5.cpp | |
| parent | 4584cb9616ffa78324544c140ef7fc0ad71744a1 (diff) | |
| download | scummvm-rg350-34eee8b33bb1295f1872b8752d904df68133ad4c.tar.gz scummvm-rg350-34eee8b33bb1295f1872b8752d904df68133ad4c.tar.bz2 scummvm-rg350-34eee8b33bb1295f1872b8752d904df68133ad4c.zip | |
cleanup
svn-id: r7756
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 59c77b23f3..b3cf4a1522 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -401,8 +401,10 @@ void Scumm_v5::o5_actorSet() { Actor *a; int i, j; - if (act == 0) + if (act == 0) { act = 1; + warning("o5_actorSet: act = 0, setting to 1 as a workaround"); + } a = derefActorSafe(act, "actorSet"); @@ -536,17 +538,16 @@ void Scumm_v5::o5_setClass() { while ((_opcode = fetchScriptByte()) != 0xFF) { newClass = getVarOrDirectWord(0x80); if (newClass == 0) { + // Class '0' means: clean all class data _classData[obj] = 0; if ((_features & GF_SMALL_HEADER) && obj <= _numActors) { Actor *a; a = derefActorSafe(obj, "setClass"); - a->ignoreBoxes = 0; + a->ignoreBoxes = false; a->forceClip = 0; } - continue; - } - - putClass(obj, newClass, (newClass & 0x80) ? true : false); + } else + putClass(obj, newClass, (newClass & 0x80) ? true : false); } } |