[Scummvm-cvs-logs] scummvm master -> 56cd7d4962a2661da305a30b67cabeb84e039755

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
56cd7d4962 TSAGE: Fix CID 1002371, 1002372, 1002373. Remove useless variable and associated code.


Commit: 56cd7d4962a2661da305a30b67cabeb84e039755
    https://github.com/scummvm/scummvm/commit/56cd7d4962a2661da305a30b67cabeb84e039755
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-26T15:44:28-07:00

Commit Message:
TSAGE: Fix CID 1002371, 1002372, 1002373. Remove useless variable and associated code.

Changed paths:
    engines/tsage/saveload.cpp
    engines/tsage/saveload.h
    engines/tsage/scenes.cpp



diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp
index dbc122e..f9e84e8 100644
--- a/engines/tsage/saveload.cpp
+++ b/engines/tsage/saveload.cpp
@@ -47,6 +47,8 @@ SavedObject::~SavedObject() {
 Saver::Saver() {
 	_macroSaveFlag = false;
 	_macroRestoreFlag = false;
+
+	_factoryPtr = nullptr;
 }
 
 Saver::~Saver() {
@@ -127,7 +129,6 @@ Common::Error Saver::save(int slot, const Common::String &saveName) {
 
 	// Set fields
 	_macroSaveFlag = true;
-	_saveSlot = slot;
 
 	// Try and create the save file
 	Common::OutSaveFile *saveFile = g_system->getSavefileManager()->openForSaving(g_vm->generateSaveName(slot));
@@ -177,7 +178,6 @@ Common::Error Saver::restore(int slot) {
 
 	// Set fields
 	_macroRestoreFlag = true;
-	_saveSlot = slot;
 	_unresolvedPtrs.clear();
 
 	// Set up the serializer
diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h
index d43ef79..fc4e12c 100644
--- a/engines/tsage/saveload.h
+++ b/engines/tsage/saveload.h
@@ -212,7 +212,6 @@ private:
 
 	bool _macroSaveFlag;
 	bool _macroRestoreFlag;
-	int _saveSlot;
 
 	void resolveLoadPointers();
 public:
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 58bb8c4..1726d6a 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -43,6 +43,7 @@ SceneManager::SceneManager() {
 	g_saver->addListener(this);
 	_objectCount = 0;
 	_loadMode = 0;
+	_sceneLoadCount = 0;
 }
 
 SceneManager::~SceneManager() {
@@ -273,6 +274,11 @@ Scene::Scene() : _sceneBounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
 	_activeScreenNumber = 0;
 	_oldSceneBounds = Rect(4000, 4000, 4100, 4100);
 	Common::fill(&_zoomPercents[0], &_zoomPercents[256], 0);
+
+	_field12 = 0;
+	_screenNumber = 0;
+	_fieldA = 0;
+	_fieldE = 0;
 }
 
 Scene::~Scene() {