[Scummvm-cvs-logs] SF.net SVN: scummvm: [29852] scummvm/trunk/engines/cine

[thebluegr at users.sourceforge.net]

Revision: 29852
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29852&view=rev
Author:   thebluegr
Date:     2007-12-13 09:53:31 -0800 (Thu, 13 Dec 2007)

Log Message:
-----------
Added a proper fix for bug #1733238 - "FW: crash in copier room", taken from next_ghost's patch #1848173 - "ScriptVars class implementation for CinE"

Modified Paths:
--------------
    scummvm/trunk/engines/cine/object.cpp
    scummvm/trunk/engines/cine/object.h

Modified: scummvm/trunk/engines/cine/object.cpp
===================================================================
--- scummvm/trunk/engines/cine/object.cpp	2007-12-13 17:47:54 UTC (rev 29851)
+++ scummvm/trunk/engines/cine/object.cpp	2007-12-13 17:53:31 UTC (rev 29852)
@@ -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 @@
 
 	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;
 }
 

Modified: scummvm/trunk/engines/cine/object.h
===================================================================
--- scummvm/trunk/engines/cine/object.h	2007-12-13 17:47:54 UTC (rev 29851)
+++ scummvm/trunk/engines/cine/object.h	2007-12-13 17:53:31 UTC (rev 29852)
@@ -53,7 +53,7 @@
 #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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.