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

[lordhoto at users.sourceforge.net]

Revision: 31839
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31839&view=rev
Author:   lordhoto
Date:     2008-05-03 05:03:24 -0700 (Sat, 03 May 2008)

Log Message:
-----------
Fixed some valgrind warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/animator_hof.cpp
    scummvm/trunk/engines/kyra/animator_v2.cpp
    scummvm/trunk/engines/kyra/items_v2.cpp

Modified: scummvm/trunk/engines/kyra/animator_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_hof.cpp	2008-05-02 23:39:34 UTC (rev 31838)
+++ scummvm/trunk/engines/kyra/animator_hof.cpp	2008-05-03 12:03:24 UTC (rev 31839)
@@ -37,8 +37,6 @@
 
 void KyraEngine_HoF::clearAnimObjects() {
 	debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::clearAnimObjects()");
-	memset(_animObjects, 0, sizeof(AnimObj) * 41);
-
 	_animObjects[0].index = 0;
 	_animObjects[0].type = 0;
 	_animObjects[0].enabled = 1;

Modified: scummvm/trunk/engines/kyra/animator_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_v2.cpp	2008-05-02 23:39:34 UTC (rev 31838)
+++ scummvm/trunk/engines/kyra/animator_v2.cpp	2008-05-03 12:03:24 UTC (rev 31839)
@@ -36,6 +36,8 @@
 	_animObjects = new AnimObj[actors+anims+items];
 	assert(_animObjects);
 
+	memset(_animObjects, 0, sizeof(AnimObj)*(actors+anims+items));
+
 	_animActor = _animObjects;
 	_animAnims = _animObjects + actors;
 	_animItems = _animObjects + actors + anims;

Modified: scummvm/trunk/engines/kyra/items_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_v2.cpp	2008-05-02 23:39:34 UTC (rev 31838)
+++ scummvm/trunk/engines/kyra/items_v2.cpp	2008-05-03 12:03:24 UTC (rev 31839)
@@ -33,7 +33,11 @@
 	delete [] _itemList;
 
 	_itemList = new Item[size];
+	assert(_itemList);
+	memset(_itemList, 0, sizeof(Item)*size);
 	_itemListSize = size;
+
+	resetItemList();
 }
 
 int KyraEngine_v2::findFreeItem() {


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