From 56cd7d4962a2661da305a30b67cabeb84e039755 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 27 Oct 2013 00:44:28 +0200 Subject: TSAGE: Fix CID 1002371, 1002372, 1002373. Remove useless variable and associated code. --- engines/tsage/scenes.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'engines/tsage/scenes.cpp') diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index 58bb8c4a44..1726d6ad20 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() { -- cgit v1.2.3 From 0948d068458d2e4f07891dd8739fcd8e2221723f Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 19 Dec 2013 08:00:25 +0100 Subject: TSAGE: Remove 3 useless variable from Scene, increment savegame version --- engines/tsage/scenes.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'engines/tsage/scenes.cpp') diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index 1726d6ad20..b41e8175c6 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -275,10 +275,7 @@ Scene::Scene() : _sceneBounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), _oldSceneBounds = Rect(4000, 4000, 4100, 4100); Common::fill(&_zoomPercents[0], &_zoomPercents[256], 0); - _field12 = 0; _screenNumber = 0; - _fieldA = 0; - _fieldE = 0; } Scene::~Scene() { @@ -288,15 +285,23 @@ void Scene::synchronize(Serializer &s) { if (s.getVersion() >= 2) StripCallback::synchronize(s); - s.syncAsSint32LE(_field12); + if (s.getVersion() < 14) { + int useless = 0; + s.syncAsSint32LE(useless); + } + s.syncAsSint32LE(_screenNumber); s.syncAsSint32LE(_activeScreenNumber); s.syncAsSint32LE(_sceneMode); _backgroundBounds.synchronize(s); _sceneBounds.synchronize(s); _oldSceneBounds.synchronize(s); - s.syncAsSint16LE(_fieldA); - s.syncAsSint16LE(_fieldE); + + if (s.getVersion() < 14) { + int useless = 0; + s.syncAsSint16LE(useless); + s.syncAsSint16LE(useless); + } for (int i = 0; i < 256; ++i) s.syncAsUint16LE(_enabledSections[i]); @@ -309,7 +314,6 @@ void Scene::synchronize(Serializer &s) { void Scene::postInit(SceneObjectList *OwnerList) { _action = NULL; - _field12 = 0; _sceneMode = 0; } -- cgit v1.2.3 From 6e715e186a857e8ed35c7e49f80ce951d8897e35 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 18 Feb 2014 02:34:26 +0100 Subject: TSAGE: Make GPL headers consistent with themselves. --- engines/tsage/scenes.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/tsage/scenes.cpp') diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index b41e8175c6..5347c588b6 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- cgit v1.2.3 From 93c06d52a532a53e37cc15aacaaa1aa4eaf27c6f Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 19 Feb 2014 21:42:55 +0100 Subject: TSAGE: Some British to American English --- engines/tsage/scenes.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/scenes.cpp') diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index 5347c588b6..04dcd295e8 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -150,6 +150,7 @@ void SceneManager::fadeInIfNecessary() { void SceneManager::changeScene(int newSceneNumber) { debug(1, "changeScene(%d)", newSceneNumber); + warning("Scene %d", newSceneNumber); // Fade out the scene ScenePalette scenePalette; uint32 adjustData = 0; -- cgit v1.2.3 From 3584680587cc0ad5c8f6c234edced42c34ec5ca4 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 19 Feb 2014 21:44:52 +0100 Subject: TSAGE: Remove leftover debug display --- engines/tsage/scenes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/tsage/scenes.cpp') diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index 04dcd295e8..80ce1e3ecc 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -150,7 +150,7 @@ void SceneManager::fadeInIfNecessary() { void SceneManager::changeScene(int newSceneNumber) { debug(1, "changeScene(%d)", newSceneNumber); - warning("Scene %d", newSceneNumber); + // Fade out the scene ScenePalette scenePalette; uint32 adjustData = 0; -- cgit v1.2.3 From 418de45d9cebfbabb05edd09ca5206d95d693867 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 2 Mar 2014 11:43:46 +0100 Subject: TOLTECS: Reduce a variable scope, move a variable to boolean --- engines/tsage/scenes.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/scenes.cpp') diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index 80ce1e3ecc..d0150dc4b1 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -150,6 +150,7 @@ void SceneManager::fadeInIfNecessary() { void SceneManager::changeScene(int newSceneNumber) { debug(1, "changeScene(%d)", newSceneNumber); + warning("Scene %d", newSceneNumber); // Fade out the scene ScenePalette scenePalette; -- cgit v1.2.3 From 6a84bf61a54bec04702629a335d601554549054b Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 2 Mar 2014 18:02:02 +0100 Subject: MISC: Revert 2 files accidentally modified in 418de45d9cebfbabb05edd09ca5206d95d693867 --- engines/tsage/scenes.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'engines/tsage/scenes.cpp') diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index d0150dc4b1..80ce1e3ecc 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -150,7 +150,6 @@ void SceneManager::fadeInIfNecessary() { void SceneManager::changeScene(int newSceneNumber) { debug(1, "changeScene(%d)", newSceneNumber); - warning("Scene %d", newSceneNumber); // Fade out the scene ScenePalette scenePalette; -- cgit v1.2.3