[Scummvm-cvs-logs] SF.net SVN: scummvm: [31041] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31041
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31041&view=rev
Author:   lordhoto
Date:     2008-03-03 15:38:22 -0800 (Mon, 03 Mar 2008)

Log Message:
-----------
Fixed some uninitialized variables.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.cpp
    scummvm/trunk/engines/kyra/sequences_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-03 23:01:59 UTC (rev 31040)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-03 23:38:22 UTC (rev 31041)
@@ -100,8 +100,20 @@
 	_colorCodeFlag2 = -1;
 	_scriptCountDown = 0;
 
+	_gamePlayBuffer = 0;
+	_unkBuf500Bytes = 0;
+	_screenBuffer = 0;
+	_unkBuf200kByte = 0;
+	memset(&_defaultShapeTable, 0, sizeof(_defaultShapeTable));
+	memset(&_sceneShapeTable, 0, sizeof(_sceneShapeTable));
 	memset(&_sceneScriptData, 0, sizeof(_sceneScriptData));
 
+	_talkObjectList = 0;
+	_shapeDescTable = 0;
+	_gfxBackUpRect = 0;
+	_sceneList = 0;
+	memset(&_sceneAnimMovie, 0, sizeof(_sceneAnimMovie));
+	memset(&_wsaSlots, 0, sizeof(_wsaSlots));
 	_backUpButtonList = _unknownButtonList = _buttonList = 0;
 	memset(&_buttonShapes, 0, sizeof(_buttonShapes));
 

Modified: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-03 23:01:59 UTC (rev 31040)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-03 23:38:22 UTC (rev 31041)
@@ -2638,6 +2638,11 @@
 		delete [] _demoShapeDefs;
 		_demoShapeDefs = 0;
 	}
+
+	delete [] _newShapeFiledata;
+	_newShapeFiledata = 0;
+
+	memset(&_defaultShapeTable, 0, sizeof(_defaultShapeTable));
 }
 
 #pragma mark -


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