[Scummvm-cvs-logs] scummvm master -> 90a6a2168abda22eb4095452cad0e33eb03566ff

Strangerke Strangerke at scummvm.org
Sun Oct 27 13:16:50 CET 2013


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

Summary:
d596f4670b TSAGE: Fix CID 1002385, 1002386, 1002388. Move some code from header to source file
90a6a2168a TSAGE: Fix CID 1002392 and CID 1002387


Commit: d596f4670b36c2bab8eeb4f051b5ace7ee2d56cd
    https://github.com/scummvm/scummvm/commit/d596f4670b36c2bab8eeb4f051b5ace7ee2d56cd
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-27T05:15:30-07:00

Commit Message:
TSAGE: Fix CID 1002385, 1002386, 1002388. Move some code from header to source file

Changed paths:
    engines/tsage/ringworld/ringworld_scenes6.cpp
    engines/tsage/ringworld/ringworld_scenes6.h
    engines/tsage/ringworld/ringworld_scenes8.cpp
    engines/tsage/ringworld/ringworld_scenes8.h



diff --git a/engines/tsage/ringworld/ringworld_scenes6.cpp b/engines/tsage/ringworld/ringworld_scenes6.cpp
index 30a91b5..9c18830 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes6.cpp
@@ -2033,6 +2033,12 @@ void Scene5300::Hotspot8::doAction(int action) {
 
 Scene5300::Scene5300() :
 		_hotspot3(0, CURSOR_LOOK, 5300, 3, CURSOR_USE, 5300, 16, LIST_END) {
+	_field1B0A = 1;
+}
+
+void Scene5300::synchronize(Serializer &s) {
+	Scene::synchronize(s);
+	s.syncAsSint16LE(_field1B0A);
 }
 
 void Scene5300::postInit(SceneObjectList *OwnerList) {
diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h
index bf353de..8b08f3b 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
diff --git a/engines/tsage/ringworld/ringworld_scenes8.cpp b/engines/tsage/ringworld/ringworld_scenes8.cpp
index 9cb85a6..f915647 100644
--- a/engines/tsage/ringworld/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes8.cpp
@@ -30,6 +30,10 @@ namespace TsAGE {
 
 namespace Ringworld {
 
+NamedHotspotMult::NamedHotspotMult() : SceneHotspot() {
+	_useLineNum = _lookLineNum = 0;
+}
+
 void NamedHotspotMult::synchronize(Serializer &s) {
 	SceneHotspot::synchronize(s);
 	s.syncAsSint16LE(_useLineNum);
@@ -2533,6 +2537,10 @@ Scene7700::Scene7700() {
 	_object5._state = 0;
 	_object6._state = 0;
 	_prof._state = 0;
+
+	_seatCountLeft1 = 0;
+	_seatCountLeft2 = 0;
+	_seatCountRight = 0;
 }
 
 void Scene7700::synchronize(Serializer &s) {
diff --git a/engines/tsage/ringworld/ringworld_scenes8.h b/engines/tsage/ringworld/ringworld_scenes8.h
index b24f220..fa441f8 100644
--- a/engines/tsage/ringworld/ringworld_scenes8.h
+++ b/engines/tsage/ringworld/ringworld_scenes8.h
@@ -40,7 +40,7 @@ using namespace TsAGE;
 class NamedHotspotMult : public SceneHotspot {
 public:
 	int _useLineNum, _lookLineNum;
-	NamedHotspotMult() : SceneHotspot() {}
+	NamedHotspotMult();
 
 	virtual Common::String getClassName() { return "NamedHotspotMult"; }
 	virtual void synchronize(Serializer &s);


Commit: 90a6a2168abda22eb4095452cad0e33eb03566ff
    https://github.com/scummvm/scummvm/commit/90a6a2168abda22eb4095452cad0e33eb03566ff
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-27T05:15:31-07:00

Commit Message:
TSAGE: Fix CID 1002392 and CID 1002387

Changed paths:
    engines/tsage/ringworld/ringworld_logic.cpp
    engines/tsage/ringworld/ringworld_scenes5.cpp
    engines/tsage/ringworld/ringworld_scenes5.h



diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 0584570..1e9d14c 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -270,6 +270,11 @@ bool DisplayObject::performAction(int action) {
 SceneArea::SceneArea() {
 	_savedArea = NULL;
 	_pt.x = _pt.y = 0;
+
+	_resNum = 0;
+	_rlbNum = 0;
+	_subNum = 0;
+	_actionId = 0;
 }
 
 SceneArea::~SceneArea() {
diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 004ccbb..725370c 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.
diff --git a/engines/tsage/ringworld/ringworld_scenes5.h b/engines/tsage/ringworld/ringworld_scenes5.h
index c93df2a..2fe26d9 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.h
+++ b/engines/tsage/ringworld/ringworld_scenes5.h
@@ -99,6 +99,7 @@ class Scene4000 : public Scene {
 	private:
 		int _ctr;
 	public:
+		Hotspot8();
 		virtual void synchronize(Serializer &s) {
 			SceneObject::synchronize(s);
 			s.syncAsUint16LE(_ctr);






More information about the Scummvm-git-logs mailing list