aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarisa-Chan2014-12-19 16:29:51 +0600
committerMarisa-Chan2014-12-19 16:29:51 +0600
commit044f2521542617d55c9cd1802f2cab7f9bccb618 (patch)
treefe07e5d349e4eb3c357fa468e05550aa0926c144
parent36af1ff5b1a813f773952fabf1906fe1fb07b846 (diff)
downloadscummvm-rg350-044f2521542617d55c9cd1802f2cab7f9bccb618.tar.gz
scummvm-rg350-044f2521542617d55c9cd1802f2cab7f9bccb618.tar.bz2
scummvm-rg350-044f2521542617d55c9cd1802f2cab7f9bccb618.zip
ZVISION: Fix uninitialized scalar field (CID 1257064)
-rw-r--r--engines/zvision/scripting/actions.cpp6
-rw-r--r--engines/zvision/scripting/actions.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index a9b19eaf2b..8ae1cd733b 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -431,10 +431,12 @@ bool ActionMenuBarEnable::execute() {
ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &line, bool global) :
ResultAction(engine, slotkey),
_volume(255),
+ _note(0),
+ _prog(0),
_universe(global) {
- uint type;
+ uint type = 0;
char fileNameBuffer[25];
- uint loop;
+ uint loop = 0;
uint volume = 255;
sscanf(line.c_str(), "%u %25s %u %u", &type, fileNameBuffer, &loop, &volume);
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index ef82ef0c88..d859b1d7f1 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -239,7 +239,6 @@ public:
bool execute();
private:
- uint32 _key;
Common::String _fileName;
bool _loop;
byte _volume;