diff options
| author | James Brown | 2002-05-14 19:44:41 +0000 |
|---|---|---|
| committer | James Brown | 2002-05-14 19:44:41 +0000 |
| commit | aad1bf41048e30f016cc224cf9b8b5916f438198 (patch) | |
| tree | d2c3f943119f4456912348faf699bec23ff167b3 /script_v1.cpp | |
| parent | caf961bfcbf207763c3d69a23d0171784088f1fb (diff) | |
| download | scummvm-rg350-aad1bf41048e30f016cc224cf9b8b5916f438198.tar.gz scummvm-rg350-aad1bf41048e30f016cc224cf9b8b5916f438198.tar.bz2 scummvm-rg350-aad1bf41048e30f016cc224cf9b8b5916f438198.zip | |
fix some warnings, odd code, and prevent Simon segfaulting when wrong game specified.
svn-id: r4321
Diffstat (limited to 'script_v1.cpp')
| -rw-r--r-- | script_v1.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/script_v1.cpp b/script_v1.cpp index 70a594b6c8..ceb35f3e6a 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -1445,7 +1445,7 @@ void Scumm::o5_getVerbEntrypoint() void Scumm::o5_ifClassOfIs() { - int act, cls, b; + int act, cls, b = 0; bool cond = true; act = getVarOrDirectWord(0x80); @@ -1454,6 +1454,8 @@ void Scumm::o5_ifClassOfIs() cls = getVarOrDirectWord(0x80); if (cls) b = getClass(act, cls); + else + error("FIXME! Ender forgot why he added this."); if (cls & 0x80 && !b || !(cls & 0x80) && b) cond = false; @@ -1984,6 +1986,7 @@ void Scumm::o5_roomOps() _opcode = fetchScriptByte(); e = getVarOrDirectByte(0x40); setScaleItem(e - 1, b, a, d, c); + break; case 8: /* room scale? */ if (_features & GF_SMALL_HEADER) { if (!(_features & GF_OLD256)) { |