aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2014-12-03 00:54:19 +0200
committerFilippos Karapetis2014-12-03 00:54:19 +0200
commitdaeb1ea288ee8ae9742f0a0fa41aeaea8c41bc9e (patch)
tree1d04f018c6eee7c80aad31d72c294a0f2c71c3ed
parent61f654e4eee90d761c06583a67dc9631db9d0d29 (diff)
downloadscummvm-rg350-daeb1ea288ee8ae9742f0a0fa41aeaea8c41bc9e.tar.gz
scummvm-rg350-daeb1ea288ee8ae9742f0a0fa41aeaea8c41bc9e.tar.bz2
scummvm-rg350-daeb1ea288ee8ae9742f0a0fa41aeaea8c41bc9e.zip
ZVISION: Silence some false positive warnings by MSVC
-rw-r--r--engines/zvision/scripting/sidefx/music_node.cpp2
-rw-r--r--engines/zvision/scripting/sidefx/syncsound_node.cpp2
-rw-r--r--engines/zvision/sound/zork_raw.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index e9baadb011..b1e16e71ef 100644
--- a/engines/zvision/scripting/sidefx/music_node.cpp
+++ b/engines/zvision/scripting/sidefx/music_node.cpp
@@ -49,7 +49,7 @@ MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool
_pantrackPosition = 0;
_sub = NULL;
- Audio::RewindableAudioStream *audioStream;
+ Audio::RewindableAudioStream *audioStream = NULL;
if (filename.contains(".wav")) {
Common::File *file = new Common::File();
diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp
index 2bfdc349d1..39542675eb 100644
--- a/engines/zvision/scripting/sidefx/syncsound_node.cpp
+++ b/engines/zvision/scripting/sidefx/syncsound_node.cpp
@@ -41,7 +41,7 @@ SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filena
_syncto = syncto;
_sub = NULL;
- Audio::RewindableAudioStream *audioStream;
+ Audio::RewindableAudioStream *audioStream = NULL;
if (filename.contains(".wav")) {
Common::File *file = new Common::File();
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index a0f660f65f..1581210c86 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -259,7 +259,7 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
Common::String fileName = getFileName(filePath);
fileName.toLowercase();
- SoundParams soundParams;
+ SoundParams soundParams = {};
if (engine->getGameId() == GID_NEMESIS) {
for (int i = 0; i < 32; ++i) {