From d596f4670b36c2bab8eeb4f051b5ace7ee2d56cd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 27 Oct 2013 12:56:19 +0100
Subject: TSAGE: Fix CID 1002385, 1002386, 1002388. Move some code from header
 to source file

---
 engines/tsage/ringworld/ringworld_scenes6.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/tsage/ringworld/ringworld_scenes6.h')

diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h
index bf353de415..8b08f3bf01 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.h
+++ b/engines/tsage/ringworld/ringworld_scenes6.h
@@ -318,15 +318,14 @@ public:
 	Hotspot6 _hotspot6;
 	Hotspot7 _hotspot7;
 	Hotspot8 _hotspot8;
+
+	// Useless variable, but removing it would break the savegames.
 	int _field1B0A;
 
 	Scene5300();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
-	virtual void synchronize(Serializer &s) {
-		Scene::synchronize(s);
-		s.syncAsSint16LE(_field1B0A);
-	}
+	virtual void synchronize(Serializer &s);
 };
 
 } // End of namespace Ringworld
-- 
cgit v1.2.3


From 7e1f280a9b56e48ea2e64a54018794c71bdefc51 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 2 Nov 2013 16:22:11 +0100
Subject: TSAGE: Ringworld - Remove one useless variable. Savegame
 compatibility preserved.

---
 engines/tsage/ringworld/ringworld_scenes6.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines/tsage/ringworld/ringworld_scenes6.h')

diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h
index 8b08f3bf01..4c10e4a711 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.h
+++ b/engines/tsage/ringworld/ringworld_scenes6.h
@@ -319,9 +319,6 @@ public:
 	Hotspot7 _hotspot7;
 	Hotspot8 _hotspot8;
 
-	// Useless variable, but removing it would break the savegames.
-	int _field1B0A;
-
 	Scene5300();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
-- 
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_scenes6.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/tsage/ringworld/ringworld_scenes6.h')

diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h
index 4c10e4a711..fcc7f900ce 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.h
+++ b/engines/tsage/ringworld/ringworld_scenes6.h
@@ -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