diff options
| author | Ludvig Strigeus | 2001-12-27 17:51:58 +0000 |
|---|---|---|
| committer | Ludvig Strigeus | 2001-12-27 17:51:58 +0000 |
| commit | 5a7b86cbf6d31b94e95843f7324052dea561e10d (patch) | |
| tree | 025539c4ed59c91eb0a7f711c7916f8e26402c53 /script.cpp | |
| parent | 1caad519e208320033b4560074d6d25467cd7648 (diff) | |
| download | scummvm-rg350-5a7b86cbf6d31b94e95843f7324052dea561e10d.tar.gz scummvm-rg350-5a7b86cbf6d31b94e95843f7324052dea561e10d.tar.bz2 scummvm-rg350-5a7b86cbf6d31b94e95843f7324052dea561e10d.zip | |
better full throttle support,
a couple of MI2 fixes.
svn-id: r3532
Diffstat (limited to 'script.cpp')
| -rw-r--r-- | script.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/script.cpp b/script.cpp index 8279629fde..35fc7c708f 100644 --- a/script.cpp +++ b/script.cpp @@ -22,8 +22,6 @@ #include "stdafx.h" #include "scumm.h" -#define NO_SOUND_HACK - void Scumm::runScript(int script, int a, int b, int16 *lvarptr) { byte *scriptPtr; uint32 scriptOffs; @@ -31,11 +29,6 @@ void Scumm::runScript(int script, int a, int b, int16 *lvarptr) { int slot; ScriptSlot *s; -#ifdef NO_SOUND_HACK - if (script==212 && _currentRoom==50) - return; -#endif - if (script==0) return; @@ -526,7 +519,7 @@ void Scumm::runExitScript() { vm.slot[slot].status = 2; vm.slot[slot].number = 10001; vm.slot[slot].where = WIO_ROOM; - vm.slot[slot].offs = _EXCD_offs + 8; + vm.slot[slot].offs = _EXCD_offs; vm.slot[slot].unk1 = 0; vm.slot[slot].unk2 = 0; vm.slot[slot].freezeCount = 0; @@ -544,7 +537,7 @@ void Scumm::runEntryScript() { vm.slot[slot].status = 2; vm.slot[slot].number = 10002; vm.slot[slot].where = WIO_ROOM; - vm.slot[slot].offs = _ENCD_offs + 8; + vm.slot[slot].offs = _ENCD_offs; vm.slot[slot].unk1 = 0; vm.slot[slot].unk2 = 0; vm.slot[slot].freezeCount = 0; @@ -700,7 +693,7 @@ int Scumm::getVerbEntrypoint(int obj, int entry) { if (whereIsObject(obj)==WIO_NOT_FOUND) return 0; - objptr = getObjectAddress(obj); + objptr = getOBCDFromObject(obj); assert(objptr); verbptr = findResource(MKID('VERB'), objptr); @@ -709,7 +702,7 @@ int Scumm::getVerbEntrypoint(int obj, int entry) { verboffs = verbptr - objptr; - verbptr += 8; + verbptr += _resourceHeaderSize; do { if (!*verbptr) return 0; |