aboutsummaryrefslogtreecommitdiff
path: root/engines/m4
diff options
context:
space:
mode:
authorMax Horn2008-07-01 10:33:25 +0000
committerMax Horn2008-07-01 10:33:25 +0000
commitbd296a45fa2ad9c08b096c50cf53ecbcd94a36a5 (patch)
tree7171c1357a2dff7ff879a36c75fe1d8c18ef540b /engines/m4
parent34a49d4a5acd1e5c71bf3f37b829e37390b3c5e1 (diff)
downloadscummvm-rg350-bd296a45fa2ad9c08b096c50cf53ecbcd94a36a5.tar.gz
scummvm-rg350-bd296a45fa2ad9c08b096c50cf53ecbcd94a36a5.tar.bz2
scummvm-rg350-bd296a45fa2ad9c08b096c50cf53ecbcd94a36a5.zip
Fixed unitialized variables
svn-id: r32865
Diffstat (limited to 'engines/m4')
-rw-r--r--engines/m4/assets.cpp1
-rw-r--r--engines/m4/converse.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/m4/assets.cpp b/engines/m4/assets.cpp
index 80b21119ff..0488f17d8f 100644
--- a/engines/m4/assets.cpp
+++ b/engines/m4/assets.cpp
@@ -201,6 +201,7 @@ void SpriteAsset::loadMadsSpriteAsset(M4Engine *vm, Common::SeekableReadStream*
Common::SeekableReadStream *spriteDataStream = sprite.getItemStream(3);
SpriteAssetFrame frame;
for (curFrame = 0; curFrame < _frameCount; curFrame++) {
+ frame.stream = 0;
frame.comp = 0;
frameOffset = spriteStream->readUint32LE();
_frameOffsets.push_back(frameOffset);
diff --git a/engines/m4/converse.cpp b/engines/m4/converse.cpp
index a07a175066..a85fdea02f 100644
--- a/engines/m4/converse.cpp
+++ b/engines/m4/converse.cpp
@@ -379,7 +379,7 @@ void Converse::loadConversation(const char *convName) {
uint32 header = convS->readUint32LE();
uint32 size;
uint32 chunk;
- uint32 data;
+ uint32 data = 0;
uint32 i;
ConvEntry* curEntry = NULL;
ConvEntry* replyEntry = NULL;