From deea4ef62c1eda0a3cba45b2f9e23be6338f52ca Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 15:41:39 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257055) --- engines/zvision/scripting/actions.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index d6883ed38f..10122f556d 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -781,6 +781,9 @@ bool ActionRotateTo::execute() { ActionSetPartialScreen::ActionSetPartialScreen(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _x = 0; + _y = 0; + char fileName[25]; int color; -- cgit v1.2.3 From 8c896f5da4eaa4cd95f9ff4c60efa43542cfe557 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 15:42:19 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257056) --- engines/zvision/scripting/actions.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 10122f556d..1d9b4d7be1 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -71,6 +71,8 @@ bool ActionAdd::execute() { ActionAssign::ActionAssign(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _key = 0; + char buf[64]; memset(buf, 0, 64); sscanf(line.c_str(), "%u, %s", &_key, buf); -- cgit v1.2.3 From f9946b726fe7ea5251fe44a77f8dab296052b744 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 15:43:46 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257057) --- engines/zvision/scripting/actions.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 1d9b4d7be1..31bd681b3b 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -654,11 +654,15 @@ bool ActionQuit::execute() { ActionRegion::ActionRegion(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _delay = 0; + _type = 0; + _unk1 = 0; + _unk2 = 0; char art[64]; char custom[64]; - int32 x1, x2, y1, y2; + int32 x1 = 0, x2 = 0, y1 = 0, y2 = 0; sscanf(line.c_str(), "%s %d %d %d %d %hu %hu %hu %hu %s", art, &x1, &y1, &x2, &y2, &_delay, &_type, &_unk1, &_unk2, custom); _art = Common::String(art); -- cgit v1.2.3 From cd2612a54ed2b5ab9e35140b5f115e39cfe0a1d7 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 15:44:41 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257058) --- engines/zvision/scripting/actions.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 31bd681b3b..62412e68f8 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -240,6 +240,9 @@ bool ActionDisableVenus::execute() { ActionDisplayMessage::ActionDisplayMessage(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _control = 0; + _msgid = 0; + sscanf(line.c_str(), "%hd %hd", &_control, &_msgid); } -- cgit v1.2.3 From e28f8a5d8f3de8e6c21be6a494ab91aaf1602216 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 15:45:54 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257059) --- engines/zvision/scripting/actions.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 62412e68f8..2f7103bf18 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -857,6 +857,8 @@ bool ActionSetScreen::execute() { ActionSetVenus::ActionSetVenus(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _key = 0; + sscanf(line.c_str(), "%d", &_key); } -- cgit v1.2.3 From f8c1b1eb28e3976fda19547230c7a8b70f31244d Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:22:57 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257062) --- engines/zvision/scripting/actions.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 2f7103bf18..a9b19eaf2b 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -95,6 +95,9 @@ bool ActionAssign::execute() { ActionAttenuate::ActionAttenuate(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _key = 0; + _attenuation = 0; + sscanf(line.c_str(), "%u, %d", &_key, &_attenuation); } -- cgit v1.2.3 From 044f2521542617d55c9cd1802f2cab7f9bccb618 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:29:51 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257064) --- engines/zvision/scripting/actions.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engines/zvision/scripting/actions.cpp') 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); -- cgit v1.2.3 From efb93552233f13128a43854a9d2ed97653a04075 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:31:33 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257065) --- engines/zvision/scripting/actions.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 8ae1cd733b..f2cfbc0684 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -132,6 +132,14 @@ bool ActionChangeLocation::execute() { ActionCrossfade::ActionCrossfade(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _keyOne = 0; + _keyTwo = 0; + _oneStartVolume = 0; + _twoStartVolume = 0; + _oneEndVolume = 0; + _twoEndVolume = 0; + _timeInMillis = 0; + sscanf(line.c_str(), "%u %u %d %d %d %d %d", &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis); -- cgit v1.2.3 From b96c58188110d7f45e4733a0a010c82f6ec62a25 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:32:27 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257066) --- engines/zvision/scripting/actions.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index f2cfbc0684..5b27f52aa5 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -57,6 +57,9 @@ namespace ZVision { ActionAdd::ActionAdd(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _key = 0; + _value = 0; + sscanf(line.c_str(), "%u,%d", &_key, &_value); } -- cgit v1.2.3 From 3b83e82e6f755dd45da8f063f3af831872d6ffdc Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:33:26 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257067) --- engines/zvision/scripting/actions.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 5b27f52aa5..a030f6ce07 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -602,6 +602,16 @@ bool ActionUnloadAnimation::execute() { ActionPlayAnimation::ActionPlayAnimation(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _x = 0; + _y = 0; + _x2 = 0; + _y2 = 0; + _start = 0; + _end = 0; + _loopCount = 0; + _mask = 0; + _framerate = 0; + char fileName[25]; // The two %*u are always 0 and dont seem to have a use -- cgit v1.2.3 From dae76a76c788950a05b827cb58cf3bd3f4bb8c32 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:34:11 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257068) --- engines/zvision/scripting/actions.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index a030f6ce07..31ba2cc5c1 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -239,6 +239,8 @@ bool ActionDisableControl::execute() { ActionDisableVenus::ActionDisableVenus(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _key = 0; + sscanf(line.c_str(), "%d", &_key); } -- cgit v1.2.3 From 9c2782a6800ada4330d2ae4f4087c7b13fbf851b Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:35:15 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257069) --- engines/zvision/scripting/actions.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 31ba2cc5c1..5689f3e2aa 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -119,6 +119,12 @@ bool ActionAttenuate::execute() { ActionChangeLocation::ActionChangeLocation(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _world = 'g'; + _room = 'a'; + _node = 'r'; + _view = 'y'; + _offset = 0; + sscanf(line.c_str(), "%c, %c, %c%c, %u", &_world, &_room, &_node, &_view, &_offset); } -- cgit v1.2.3 From ea2ad625ff780750213821d25aedfe4e46027755 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:36:54 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257070) --- engines/zvision/scripting/actions.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 5689f3e2aa..b569b1315a 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -973,8 +973,10 @@ bool ActionStreamVideo::execute() { ActionSyncSound::ActionSyncSound(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _syncto = 0; + char fileName[25]; - int notUsed; + int notUsed = 0; sscanf(line.c_str(), "%d %d %25s", &_syncto, ¬Used, fileName); -- cgit v1.2.3 From 8278ed6022f4b172c6173866224071f381a12bd5 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:38:34 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257071) --- engines/zvision/scripting/actions.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index b569b1315a..a14fa37e4b 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -319,6 +319,8 @@ bool ActionDistort::execute() { ActionEnableControl::ActionEnableControl(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _key = 0; + sscanf(line.c_str(), "%u", &_key); } -- cgit v1.2.3 From 704a4b3400e07ce5d86e7db7e63c3cc89da383e9 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:39:21 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257072) --- engines/zvision/scripting/actions.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index a14fa37e4b..a5cc37a2f7 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -217,6 +217,7 @@ bool ActionCursor::execute() { ActionDelayRender::ActionDelayRender(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _framesToDelay = 0; sscanf(line.c_str(), "%u", &_framesToDelay); } -- cgit v1.2.3 From 897ecc190fc7233fa45082e24b97ff37bab1bc0c Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:41:51 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257074) --- engines/zvision/scripting/actions.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index a5cc37a2f7..7e3a0667aa 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -594,6 +594,7 @@ bool ActionPreloadAnimation::execute() { ActionUnloadAnimation::ActionUnloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _key = 0; sscanf(line.c_str(), "%u", &_key); } -- cgit v1.2.3 From 7055ee77552f9126be095aac83ecfcef425f4dd3 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:44:18 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257075) --- engines/zvision/scripting/actions.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 7e3a0667aa..68e9b04dd5 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -298,6 +298,13 @@ bool ActionDissolve::execute() { ActionDistort::ActionDistort(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _distSlot = 0; + _speed = 0; + _startAngle = 60.0; + _endAngle = 60.0; + _startLineScale = 1.0; + _endLineScale = 1.0; + sscanf(line.c_str(), "%hd %hd %f %f %f %f", &_distSlot, &_speed, &_startAngle, &_endAngle, &_startLineScale, &_endLineScale); } -- cgit v1.2.3 From 1078d0c19311b82db00d4524f5f29e7f2ca52795 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 16:51:01 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257079) --- engines/zvision/scripting/actions.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') 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 -- cgit v1.2.3 From 5db4e02f9a5bc756807102e76374c493b80cc028 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 17:02:22 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257082) --- engines/zvision/scripting/actions.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 6e6674d755..b08a7f3c85 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -938,8 +938,14 @@ bool ActionStop::execute() { ActionStreamVideo::ActionStreamVideo(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _x1 = 0; + _x2 = 0; + _y1 = 0; + _y2 = 0; + _flags = 0; + char fileName[25]; - uint skipline; //skipline - render video with skip every second line, not skippable. + uint skipline = 0; //skipline - render video with skip every second line, not skippable. sscanf(line.c_str(), "%25s %u %u %u %u %u %u", fileName, &_x1, &_y1, &_x2, &_y2, &_flags, &skipline); -- cgit v1.2.3 From d6e3cea087bd10619f9bad305a03f1517d714687 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 17:03:07 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257083) --- engines/zvision/scripting/actions.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index b08a7f3c85..dbbb605e43 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -1050,9 +1050,11 @@ bool ActionTimer::execute() { ActionTtyText::ActionTtyText(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _delay = 0; + char filename[64]; - int32 x1, y1, x2, y2; - sscanf(line.c_str(), "%d %d %d %d %s %u", &x1, &y1, &x2, &y2, filename, &_delay); + int32 x1 = 0, y1 = 0, x2 = 0, y2 = 0; + sscanf(line.c_str(), "%d %d %d %d %64s %u", &x1, &y1, &x2, &y2, filename, &_delay); _r = Common::Rect(x1, y1, x2, y2); _filename = Common::String(filename); } -- cgit v1.2.3 From 7e3c270e49c36cb7290955ded4dc4588f763797a Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 17:03:39 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257084) --- engines/zvision/scripting/actions.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index dbbb605e43..63033886c6 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -675,6 +675,15 @@ bool ActionPlayAnimation::execute() { ActionPlayPreloadAnimation::ActionPlayPreloadAnimation(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _controlKey = 0; + _x1 = 0; + _y1 = 0; + _x2 = 0; + _y2 = 0; + _startFrame = 0; + _endFrame = 0; + _loopCount = 0; + sscanf(line.c_str(), "%u %u %u %u %u %u %u %u", &_controlKey, &_x1, &_y1, &_x2, &_y2, &_startFrame, &_endFrame, &_loopCount); -- cgit v1.2.3 From 7a0b5982b133c8ef5ed87cd1418ea28cf7da96fb Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 17:04:04 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257085) --- engines/zvision/scripting/actions.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 63033886c6..60d05fb063 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -832,6 +832,9 @@ bool ActionRestoreGame::execute() { ActionRotateTo::ActionRotateTo(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _time = 0; + _toPos = 0; + sscanf(line.c_str(), "%d, %d", &_toPos, &_time); } -- cgit v1.2.3 From 7609b6d866576de9a70aadfb17895cfd30393eb8 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 17:04:26 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257086) --- engines/zvision/scripting/actions.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 60d05fb063..5274637ca0 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -232,6 +232,8 @@ bool ActionDelayRender::execute() { ActionDisableControl::ActionDisableControl(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _key = 0; + sscanf(line.c_str(), "%u", &_key); } -- cgit v1.2.3 From 2cb541c6511d39e7814f38c1b6e1cc64b7589671 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 17:05:03 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257087) --- engines/zvision/scripting/actions.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 5274637ca0..fd843276c0 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -359,6 +359,9 @@ bool ActionFlushMouseEvents::execute() { ActionInventory::ActionInventory(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _type = -1; + _key = 0; + char buf[25]; sscanf(line.c_str(), "%25s %d", buf, &_key); -- cgit v1.2.3 From c8f8da030845c01453652364a48ae0449d62b890 Mon Sep 17 00:00:00 2001 From: Marisa-Chan Date: Fri, 19 Dec 2014 17:05:31 +0600 Subject: ZVISION: Fix uninitialized scalar field (CID 1257088) --- engines/zvision/scripting/actions.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/zvision/scripting/actions.cpp') diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index fd843276c0..0422a2c028 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -450,6 +450,8 @@ bool ActionKill::execute() { ActionMenuBarEnable::ActionMenuBarEnable(ZVision *engine, int32 slotkey, const Common::String &line) : ResultAction(engine, slotkey) { + _menus = 0xFFFF; + sscanf(line.c_str(), "%hu", &_menus); } -- cgit v1.2.3