aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2002-10-01 22:39:15 +0000
committerMax Horn2002-10-01 22:39:15 +0000
commita1f749994f82ca6f5c73a5be39ff50f207f53738 (patch)
tree8a38f0617fc5f9ee46b0cac7806906d205d629dc /scumm
parent7d6ebdc2891c1cea320e6ae51118373b686d84dd (diff)
downloadscummvm-rg350-a1f749994f82ca6f5c73a5be39ff50f207f53738.tar.gz
scummvm-rg350-a1f749994f82ca6f5c73a5be39ff50f207f53738.tar.bz2
scummvm-rg350-a1f749994f82ca6f5c73a5be39ff50f207f53738.zip
unsigned <-> signed, local vars were not inited
svn-id: r5065
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse.cpp4
-rw-r--r--scumm/imuse.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index cae65cdfaf..68df773f11 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -4855,7 +4855,7 @@ IMuseDigital::~IMuseDigital() {
void IMuseDigital::handler() {
bool new_mixer;
- int32 l, idx;
+ int32 l, idx = 0;
for (l = 0; l < MAX_DIGITAL_CHANNELS;l ++) {
if (_channel[l]._used) {
@@ -4939,7 +4939,7 @@ void IMuseDigital::startSound(int sound) {
_channel[l]._numJumps = 0;
ptr += 16;
- uint32 tag, size;
+ uint32 tag, size = 0;
for (;;) {
tag = READ_BE_UINT32(ptr); ptr += 4;
diff --git a/scumm/imuse.h b/scumm/imuse.h
index 7aa61ed190..c731913192 100644
--- a/scumm/imuse.h
+++ b/scumm/imuse.h
@@ -99,7 +99,7 @@ private:
uint8 _mixerFlags;
bool _used;
bool _toBeRemoved;
- uint32 _mixerTrack;
+ int32 _mixerTrack;
} _channel[MAX_DIGITAL_CHANNELS];
Scumm * _scumm;