diff options
| author | Filippos Karapetis | 2007-12-13 17:53:31 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-12-13 17:53:31 +0000 |
| commit | ee56120fcff9fdbc5a4e068f104c4d4658b43507 (patch) | |
| tree | 32d27e48f5f93d273a061ddf26c7fb17a0631444 | |
| parent | 3240d0636a59c7a8c1f00bb73aa08894e3b80a2f (diff) | |
| download | scummvm-rg350-ee56120fcff9fdbc5a4e068f104c4d4658b43507.tar.gz scummvm-rg350-ee56120fcff9fdbc5a4e068f104c4d4658b43507.tar.bz2 scummvm-rg350-ee56120fcff9fdbc5a4e068f104c4d4658b43507.zip | |
Added a proper fix for bug #1733238 - "FW: crash in copier room", taken from next_ghost's patch #1848173 - "ScriptVars class implementation for CinE"
svn-id: r29852
| -rw-r--r-- | engines/cine/object.cpp | 8 | ||||
| -rw-r--r-- | engines/cine/object.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp index 2c68c214f0..f8af6ee28a 100644 --- a/engines/cine/object.cpp +++ b/engines/cine/object.cpp @@ -36,7 +36,7 @@ namespace Cine { objectStruct objectTable[NUM_MAX_OBJECT]; -uint16 globalVars[NUM_MAX_OBJECTDATA]; +uint16 globalVars[NUM_MAX_OBJECTDATA + 1]; overlayHeadElement overlayHead; void unloadAllMasks(void) { @@ -151,11 +151,7 @@ int16 freeOverlay(uint16 objIdx, uint16 param) { tempPtr2->previous = currentHeadPtr->previous; - // FIXME: is this needed? It causes crashes in Windows in the drawOverlays function - // (the currentOverlay pointer is incorrect) - // Removing this fixes bug #1733238 - FW: crash in copier room - // Also, it stops the game from crashing right after the introduction - //free(currentHeadPtr); + free(currentHeadPtr); return 0; } diff --git a/engines/cine/object.h b/engines/cine/object.h index 7d4d492bf2..d7d4e145ff 100644 --- a/engines/cine/object.h +++ b/engines/cine/object.h @@ -53,7 +53,7 @@ struct overlayHeadElement { #define NUM_MAX_OBJECTDATA 255 extern objectStruct objectTable[NUM_MAX_OBJECT]; -extern uint16 globalVars[NUM_MAX_OBJECTDATA]; +extern uint16 globalVars[NUM_MAX_OBJECTDATA + 1]; extern overlayHeadElement overlayHead; |