aboutsummaryrefslogtreecommitdiff
path: root/engines/cine/object.cpp
diff options
context:
space:
mode:
authorDavid Corrales2007-06-23 18:51:33 +0000
committerDavid Corrales2007-06-23 18:51:33 +0000
commitcacd7a28fd51d960947de88abbf30c487e66529d (patch)
treef3baa59853bfb307e452b86b9d93c4737b1fa6ab /engines/cine/object.cpp
parent0ac96302fe9c04df79cb01a77d19535b45fe2db0 (diff)
parent90c2210dae8c91fa8babc6b05564e15c9d445d18 (diff)
downloadscummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.gz
scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.bz2
scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.zip
Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
Diffstat (limited to 'engines/cine/object.cpp')
-rw-r--r--engines/cine/object.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp
index 1e92234e04..cab8d98977 100644
--- a/engines/cine/object.cpp
+++ b/engines/cine/object.cpp
@@ -160,7 +160,11 @@ int16 freeOverlay(uint16 objIdx, uint16 param) {
tempPtr2->previous = currentHeadPtr->previous;
- free(currentHeadPtr);
+ // 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);
return 0;
}