diff options
| -rw-r--r-- | script.cpp | 4 | ||||
| -rw-r--r-- | script_v2.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/script.cpp b/script.cpp index 07343e8ae3..620c20af1e 100644 --- a/script.cpp +++ b/script.cpp @@ -716,12 +716,12 @@ int Scumm::getVerbEntrypoint(int obj, int entry) { void Scumm::push(int a) { - assert(_scummStackPos >=0 && _scummStackPos < sizeof(_scummStack)-1); + assert(_scummStackPos >=0 && _scummStackPos < ARRAYSIZE(_scummStack)-1); _scummStack[_scummStackPos++] = a; } int Scumm::pop() { - assert(_scummStackPos >0 && _scummStackPos < sizeof(_scummStack)); + assert(_scummStackPos >0 && _scummStackPos < ARRAYSIZE(_scummStack)); return _scummStack[--_scummStackPos]; } diff --git a/script_v2.cpp b/script_v2.cpp index e4d9b42bc4..7495248b01 100644 --- a/script_v2.cpp +++ b/script_v2.cpp @@ -1274,7 +1274,8 @@ void Scumm::o6_resourceRoutines() { nukeCharset(res); break; case 119:/* load fl object */ - loadFlObject(pop(), (_features & GF_HAS_ROOMTABLE) ? -1 : pop()); + res = (_features & GF_HAS_ROOMTABLE) ? -1 : pop(); + loadFlObject(pop(), res); break; default: error("o6_resourceRoutines: default case"); |