Merge pull request #549 from Marisa-Chan/master

ZVISION: Delete unused code

6 files changed, 17 insertions, 8 deletions

diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 6959f9eca9..e75cc15743 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -46,7 +46,9 @@ InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	  _enterPressed(false),
 	  _readOnly(false),
 	  _txtWidth(0),
-	  _animation(NULL) {
+	  _animation(NULL),
+	  _frameDelay(0),
+	  _frame(-1) {
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
 	_engine->getScriptManager()->trimCommentsAndWhiteSpace(&line);
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 71dd52f40f..8faa18357c 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -48,7 +48,10 @@ LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 	  _mouseIsCaptured(false),
 	  _isReturning(false),
 	  _accumulatedTime(0),
-	  _returnRoutesCurrentFrame(0) {
+	  _returnRoutesCurrentFrame(0),
+	  _animation(NULL),
+	  _cursor(CursorIndex_Active),
+	  _mirrored(false) {
 
 	// Loop until we find the closing brace
 	Common::String line = stream.readLine();
diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp
index f06dee25ad..df06bb814e 100644
--- a/engines/zvision/scripting/controls/paint_control.cpp
+++ b/engines/zvision/scripting/controls/paint_control.cpp
@@ -69,7 +69,7 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
 		} else if (param.matchString("eligible_objects", true)) {
 			char buf[256];
 			memset(buf, 0, 256);
-			strcpy(buf, values.c_str());
+			strncpy(buf, values.c_str(), 255);
 
 			char *curpos = buf;
 			char *strend = buf + strlen(buf);
diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp
index 3811498cd5..f51a28d644 100644
--- a/engines/zvision/scripting/controls/push_toggle_control.cpp
+++ b/engines/zvision/scripting/controls/push_toggle_control.cpp
@@ -35,6 +35,7 @@ namespace ZVision {
 PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
 	: Control(engine, key, CONTROL_PUSHTGL),
 	  _countTo(2),
+	  _cursor(CursorIndex_Active),
 	  _event(Common::EVENT_LBUTTONUP) {
 
 	_hotspots.clear();
diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index e27faa50b6..b35611feca 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -77,10 +77,11 @@ SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 			Common::SeekableReadStream *save = _engine->getSaveManager()->getSlotFile(iter->saveId);
 			if (save) {
 				SaveGameHeader header;
-				_engine->getSaveManager()->readSaveGameHeader(save, header);
+				if (_engine->getSaveManager()->readSaveGameHeader(save, header)) {
+					inp->setText(header.saveName);
+					iter->exist = true;
+				}
 				delete save;
-				inp->setText(header.saveName);
-				iter->exist = true;
 			}
 		}
 	}
diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp
index 292a2b4bc9..42b54a9ab5 100644
--- a/engines/zvision/scripting/controls/slot_control.cpp
+++ b/engines/zvision/scripting/controls/slot_control.cpp
@@ -34,7 +34,9 @@
 namespace ZVision {
 
 SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
-	: Control(engine, key, CONTROL_SLOT) {
+	: Control(engine, key, CONTROL_SLOT),
+	  _cursor(CursorIndex_Active),
+	  _distanceId('0') {
 
 	_renderedItem = 0;
 	_bkg = NULL;
@@ -74,7 +76,7 @@ SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream
 		} else if (param.matchString("eligible_objects", true)) {
 			char buf[256];
 			memset(buf, 0, 256);
-			strcpy(buf, values.c_str());
+			strncpy(buf, values.c_str(), 255);
 
 			char *curpos = buf;
 			char *strend = buf + strlen(buf);