From 70fc8eff6545bbddf640876ada2f1ebc39e26e8a Mon Sep 17 00:00:00 2001
From: Andrew Kurushin
Date: Sat, 19 Nov 2005 10:45:41 +0000
Subject: fix compile warning

svn-id: r19664
---
 scumm/string.cpp | 4 ++--
 simon/sound.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scumm/string.cpp b/scumm/string.cpp
index 6e107fd8f8..ee761bd63e 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -138,7 +138,7 @@ void ScummEngine_v7::clearSubtitleQueue() {
 bool ScummEngine::handleNextCharsetCode(Actor *a, int *code) {
 	uint32 talk_sound_a = 0;
 	uint32 talk_sound_b = 0;
-	int color, frme, c, oldy;
+	int color, frme, c = 0, oldy;
 	bool endLoop = false;
 	byte *buffer = _charsetBuffer + _charsetBufPos;
 	while (!endLoop) {
@@ -220,7 +220,7 @@ bool ScummEngine_v72he::handleNextCharsetCode(Actor *a, int *code) {
 	const int charsetCode = (_heversion >= 80) ? 127 : 64;
 	uint32 talk_sound_a = 0;
 	uint32 talk_sound_b = 0;
-	int i, c;
+	int i, c = 0;
 	char value[32];
 	bool endLoop = false;
 	bool endText = false;
diff --git a/simon/sound.cpp b/simon/sound.cpp
index 160a1a125f..000b46d0e4 100644
--- a/simon/sound.cpp
+++ b/simon/sound.cpp
@@ -471,7 +471,7 @@ void Sound::playSoundData(byte *soundData, uint sound, uint pan, uint vol, bool
 	}
 
 	soundData += READ_LE_UINT32(soundData + sound * 4);
-	int32 size = READ_LE_UINT32(soundData + 4);
+	int size = READ_LE_UINT32(soundData + 4);
 	Common::MemoryReadStream stream(soundData, size);
 	if (!loadWAVFromStream(stream, size, rate, flags)) {
 		error("playSoundData: Not a valid WAV data");
-- 
cgit v1.2.3