diff options
Diffstat (limited to 'engines/toon/script.cpp')
| -rw-r--r-- | engines/toon/script.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engines/toon/script.cpp b/engines/toon/script.cpp index 5e56432012..e72dafe1cc 100644 --- a/engines/toon/script.cpp +++ b/engines/toon/script.cpp @@ -72,6 +72,7 @@ EMCInterpreter::~EMCInterpreter() { bool EMCInterpreter::callback(Common::IFFChunk &chunk) { switch (chunk._type) { case MKID_BE('TEXT'): + delete[] _scriptData->text; _scriptData->text = new byte[chunk._size]; assert(_scriptData->text); if (chunk._stream->read(_scriptData->text, chunk._size) != chunk._size) @@ -79,6 +80,7 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) { break; case MKID_BE('ORDR'): + delete[] _scriptData->ordr; _scriptData->ordr = new uint16[chunk._size >> 1]; assert(_scriptData->ordr); if (chunk._stream->read(_scriptData->ordr, chunk._size) != chunk._size) @@ -89,6 +91,7 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) { break; case MKID_BE('DATA'): + delete[] _scriptData->data; _scriptData->data = new uint16[chunk._size >> 1]; assert(_scriptData->data); if (chunk._stream->read(_scriptData->data, chunk._size) != chunk._size) @@ -148,11 +151,13 @@ void EMCInterpreter::unload(EMCData *data) { return; delete[] data->text; + data->text = NULL; + delete[] data->ordr; - delete[] data->data; + data->ordr = NULL; - data->text = 0; - data->ordr = data->data = 0; + delete[] data->data; + data->data = NULL; } void EMCInterpreter::init(EMCState *scriptStat, const EMCData *data) { @@ -184,7 +189,6 @@ bool EMCInterpreter::isValid(EMCState *script) { } bool EMCInterpreter::run(EMCState *script) { - if (script->running) return false; @@ -195,7 +199,6 @@ bool EMCInterpreter::run(EMCState *script) { script->running = true; - // Should be no Problem at all to cast to uint32 here, since that's the biggest ptrdiff the original // would allow, of course that's not realistic to happen to be somewhere near the limit of uint32 anyway. const uint32 instOffset = (uint32)((const byte *)script->ip - (const byte *)script->dataPtr->data); |