aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarisa-Chan2014-12-19 16:51:01 +0600
committerMarisa-Chan2014-12-19 16:51:01 +0600
commit1078d0c19311b82db00d4524f5f29e7f2ca52795 (patch)
tree89831f95865c92ddeabc0181a1f9bfca8b7d9caa
parentea3ddd148f88d3aca21a0626ba4700873324897d (diff)
downloadscummvm-rg350-1078d0c19311b82db00d4524f5f29e7f2ca52795.tar.gz
scummvm-rg350-1078d0c19311b82db00d4524f5f29e7f2ca52795.tar.bz2
scummvm-rg350-1078d0c19311b82db00d4524f5f29e7f2ca52795.zip
ZVISION: Fix uninitialized scalar field (CID 1257079)
-rw-r--r--engines/zvision/scripting/actions.cpp3
-rw-r--r--engines/zvision/scripting/actions.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 68e9b04dd5..6e6674d755 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -565,6 +565,9 @@ bool ActionPreferences::execute() {
ActionPreloadAnimation::ActionPreloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line) :
ResultAction(engine, slotkey) {
+ _mask = 0;
+ _framerate = 0;
+
char fileName[25];
// The two %*u are always 0 and dont seem to have a use
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index ee761c4b30..18757e0dea 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -302,7 +302,6 @@ public:
bool execute();
private:
- uint32 _key;
Common::String _fileName;
int32 _mask;
int32 _framerate;