From 90a6a2168abda22eb4095452cad0e33eb03566ff Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 27 Oct 2013 13:14:57 +0100
Subject: TSAGE: Fix CID 1002392 and CID 1002387

---
 engines/tsage/ringworld/ringworld_scenes5.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines/tsage/ringworld/ringworld_scenes5.cpp')

diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 004ccbbb6d..725370c8a4 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -34,6 +34,9 @@ namespace Ringworld {
  * Scene 4000 - Village
  *
  *--------------------------------------------------------------------------*/
+Scene4000::Hotspot8::Hotspot8() : SceneObject() {
+	_ctr = 0;	
+}
 
 void Scene4000::Action1::signal() {
 	// Quinn has the peg. Everybody enter the screen.
-- 
cgit v1.2.3


From 784796779893f5fa280f634139aceff7324514df Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 10 Nov 2013 23:00:15 +0100
Subject: TSAGE: Janitorial - Remove trailing spaces and tabs

---
 engines/tsage/ringworld/ringworld_scenes5.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tsage/ringworld/ringworld_scenes5.cpp')

diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 725370c8a4..1b6cd78223 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -35,7 +35,7 @@ namespace Ringworld {
  *
  *--------------------------------------------------------------------------*/
 Scene4000::Hotspot8::Hotspot8() : SceneObject() {
-	_ctr = 0;	
+	_ctr = 0;
 }
 
 void Scene4000::Action1::signal() {
-- 
cgit v1.2.3


From ca7a5cbfc3149b7080ed03c84249103ab42d4c0a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 19 Dec 2013 07:48:08 +0100
Subject: TSAGE: Some renaming in StripManager

---
 engines/tsage/ringworld/ringworld_scenes5.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/ringworld/ringworld_scenes5.cpp')

diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 1b6cd78223..a3cc08f330 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -462,7 +462,7 @@ void Scene4000::Action12::signal() {
 		break;
 	case 2:
 		g_globals->setFlag(32);
-		if (scene->_stripManager._field2E8 == 275) {
+		if (scene->_stripManager._currObj44Id == 275) {
 			g_globals->setFlag(82);
 			ADD_MOVER_NULL(scene->_guardRock, 292, 138);
 			ADD_PLAYER_MOVER(283, 147);
@@ -471,7 +471,7 @@ void Scene4000::Action12::signal() {
 		}
 		break;
 	case 3:
-		if (scene->_stripManager._field2E8 == 275) {
+		if (scene->_stripManager._currObj44Id == 275) {
 			g_globals->_sceneManager.changeScene(4100);
 		} else {
 			ADD_PLAYER_MOVER_THIS(scene->_guardRock, 300, 132);
-- 
cgit v1.2.3


From 0bcbf931ed205a3b1523bc03f2bbdb0b33d9b1f6 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 19 Dec 2013 08:08:54 +0100
Subject: TSAGE: Ringworld - Remove a useless variable

---
 engines/tsage/ringworld/ringworld_scenes5.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines/tsage/ringworld/ringworld_scenes5.cpp')

diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index a3cc08f330..1242f9f448 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -4222,7 +4222,12 @@ void Scene4300::process(Event &event) {
 
 void Scene4301::Action1::synchronize(Serializer &s) {
 	Action::synchronize(s);
-	s.syncAsSint16LE(_field34E);
+
+	if (s.getVersion() < 14) {
+		int useless = 0;
+		s.syncAsSint16LE(useless);
+	}
+
 	for (int idx = 0; idx < 6; ++idx)
 		s.syncAsSint16LE(_indexList[idx]);
 }
@@ -4268,7 +4273,6 @@ void Scene4301::Action1::signal() {
 		scene->_hotspot3.fixPriority(255);
 		scene->_hotspot3.hide();
 
-		_field34E = 0;
 		_state = 0;
 		_actionIndex = 2;
 		break;
-- 
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/ringworld/ringworld_scenes5.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/tsage/ringworld/ringworld_scenes5.cpp')

diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 1242f9f448..cb8a89de80 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.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