aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-13 18:12:17 +0000
committerJohannes Schickel2009-05-13 18:12:17 +0000
commitf0182121f79685063edb50c9647e4f6f40bd0ba6 (patch)
tree482cd6fbe9b6a8fae81a72b9c3fc03961a9eda45 /engines/cruise
parentb9ac179b2e601f761cc60d431a3e5428f3740935 (diff)
downloadscummvm-rg350-f0182121f79685063edb50c9647e4f6f40bd0ba6.tar.gz
scummvm-rg350-f0182121f79685063edb50c9647e4f6f40bd0ba6.tar.bz2
scummvm-rg350-f0182121f79685063edb50c9647e4f6f40bd0ba6.zip
Fix some variable may be used uninitialized warnings.
svn-id: r40528
Diffstat (limited to 'engines/cruise')
-rw-r--r--engines/cruise/dataLoader.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index ef333be6c6..ac87d1305b 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -53,6 +53,9 @@ void decodeGfxUnified(dataFileEntry *pCurrentFileEntry, int16 format) {
case 5:
spriteSize = pCurrentFileEntry->height * pCurrentFileEntry->widthInColumn;
break;
+
+ default:
+ error("Unkown gfx format %d", format);
}
uint8 *buffer = (uint8 *)malloc(spriteSize);
@@ -66,7 +69,7 @@ void decodeGfxUnified(dataFileEntry *pCurrentFileEntry, int16 format) {
uint8 c;
uint16 p0;
// Format 4
- uint16 p1, p2, p3;
+ uint16 p1 = 0, p2 = 0, p3 = 0;
p0 = (dataPtr[0] << 8) | dataPtr[1];