aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2008-05-03 12:03:24 +0000
committerJohannes Schickel2008-05-03 12:03:24 +0000
commit3aaff020c756c638bfd59f10a2c39fb376a5a183 (patch)
treea18efd3c4231f7bf67d6297eb1f4ce16bb7a3730 /engines/kyra
parent7bd06d120031186a3a2ea90f5a8366e33355e42a (diff)
downloadscummvm-rg350-3aaff020c756c638bfd59f10a2c39fb376a5a183.tar.gz
scummvm-rg350-3aaff020c756c638bfd59f10a2c39fb376a5a183.tar.bz2
scummvm-rg350-3aaff020c756c638bfd59f10a2c39fb376a5a183.zip
Fixed some valgrind warnings.
svn-id: r31839
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/animator_hof.cpp2
-rw-r--r--engines/kyra/animator_v2.cpp2
-rw-r--r--engines/kyra/items_v2.cpp4
3 files changed, 6 insertions, 2 deletions
diff --git a/engines/kyra/animator_hof.cpp b/engines/kyra/animator_hof.cpp
index 76c66252ee..9314f8604e 100644
--- a/engines/kyra/animator_hof.cpp
+++ b/engines/kyra/animator_hof.cpp
@@ -37,8 +37,6 @@ void KyraEngine_HoF::restorePage3() {
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;
diff --git a/engines/kyra/animator_v2.cpp b/engines/kyra/animator_v2.cpp
index 10f7b02579..83081ca105 100644
--- a/engines/kyra/animator_v2.cpp
+++ b/engines/kyra/animator_v2.cpp
@@ -36,6 +36,8 @@ void KyraEngine_v2::allocAnimObjects(int actors, int anims, int items) {
_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;
diff --git a/engines/kyra/items_v2.cpp b/engines/kyra/items_v2.cpp
index c207a99963..78768c70ab 100644
--- a/engines/kyra/items_v2.cpp
+++ b/engines/kyra/items_v2.cpp
@@ -33,7 +33,11 @@ void KyraEngine_v2::initItemList(int size) {
delete [] _itemList;
_itemList = new Item[size];
+ assert(_itemList);
+ memset(_itemList, 0, sizeof(Item)*size);
_itemListSize = size;
+
+ resetItemList();
}
int KyraEngine_v2::findFreeItem() {