[Scummvm-cvs-logs] scummvm master -> d0ce04c96824ab0c2957e33ceb830fb1d9caf8eb

Strangerke Strangerke at scummvm.org
Wed Aug 21 22:05:56 CEST 2013


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

Summary:
bc4e4ec9b8 TSAGE: R2R - Fix CID 1063348
146c24484c TSAGE: R2R - Fix CID 1063175
4f50702ea6 TSAGE: R2R - Fix CID 1047261
a606467183 TSAGE: R2R - Fix CID 1047260
5512458440 TSAGE: R2R - Fix CID 1047256
d0ce04c968 TSAGE: R2R - Fix CID 1004057


Commit: bc4e4ec9b85186e80a926ee0ad71add773f3d430
    https://github.com/scummvm/scummvm/commit/bc4e4ec9b85186e80a926ee0ad71add773f3d430
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-21T11:37:38-07:00

Commit Message:
TSAGE: R2R - Fix CID 1063348

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp
    engines/tsage/ringworld2/ringworld2_scenes0.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 1cc33e2..f1fb75a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4822,6 +4822,11 @@ void Scene400::dispatch() {
  *
  *--------------------------------------------------------------------------*/
 
+Scene500::PanelDialog::Button::Button() {
+	_buttonId = 0;
+	_buttonDown = false;
+}
+
 bool Scene500::ControlPanel::startAction(CursorType action, Event &event) {
 	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 273c984..67f210a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -533,6 +533,7 @@ class Scene500: public SceneExt {
 
 			void doButtonPress();		
 		public:
+			Button();
 			virtual Common::String getClassName() { return "Scene500_Button"; }
 			virtual void process(Event &event);
 			virtual bool startAction(CursorType action, Event &event);


Commit: 146c24484c5c83d2d9fe6bfcae039cc8729ebc8f
    https://github.com/scummvm/scummvm/commit/146c24484c5c83d2d9fe6bfcae039cc8729ebc8f
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-21T11:47:44-07:00

Commit Message:
TSAGE: R2R - Fix CID 1063175

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 4e9d019..512ece5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -39,6 +39,7 @@ Scene1000::Scene1000(): SceneExt() {
 	R2_GLOBALS._uiElements._active = false;
 	_gameTextSpeaker._displayMode = 9;
 	_fieldD2E = 0;
+	_field412 = 0;
 }
 
 void Scene1000::postInit(SceneObjectList *OwnerList) {


Commit: 4f50702ea616c229c4cd981c8a0fb59b86823cd1
    https://github.com/scummvm/scummvm/commit/4f50702ea616c229c4cd981c8a0fb59b86823cd1
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-21T12:03:52-07:00

Commit Message:
TSAGE: R2R - Fix CID 1047261

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index f1fb75a..f41add9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -5699,7 +5699,8 @@ bool Scene600::Laser::startAction(CursorType action, Event &event) {
 bool Scene600::Aerosol::startAction(CursorType action, Event &event) {
 	Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action < CURSOR_WALK) && (action >= R2CURSORS_START)) {
+	// CHECKME: The original is checking is action == 0. To be verified.
+	if (action == INV_NONE) {
 		return false;
 	} else if (action == CURSOR_USE) {
 		R2_GLOBALS._player.disableControl();


Commit: a606467183a2fe4bf803835f5e4fe322a330e0d4
    https://github.com/scummvm/scummvm/commit/a606467183a2fe4bf803835f5e4fe322a330e0d4
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-21T12:07:15-07:00

Commit Message:
TSAGE: R2R - Fix CID 1047260

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index f41add9..c175600 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -5587,7 +5587,8 @@ GfxSurface Scene600::Actor4::getFrame() {
 }
 
 bool Scene600::Doorway::startAction(CursorType action, Event &event) {
-	if ((action < CURSOR_WALK) && (action >= R2CURSORS_START))
+	// CHECKME: The original is checking is action == 0. To be verified.
+	if (action == INV_NONE)
 		return false;
 
 	if (action != CURSOR_USE)


Commit: 55124584400b73800362cc2e20b95679a4933471
    https://github.com/scummvm/scummvm/commit/55124584400b73800362cc2e20b95679a4933471
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-21T12:40:47-07:00

Commit Message:
TSAGE: R2R - Fix CID 1047256

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes2.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 9246c4b..bfed1eb 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -769,6 +769,7 @@ Scene2000::Scene2000(): SceneExt() {
 	}
 
 	_exitingFlag = false;
+	_mazePlayerMode = 0;
 }
 
 void Scene2000::postInit(SceneObjectList *OwnerList) {


Commit: d0ce04c96824ab0c2957e33ceb830fb1d9caf8eb
    https://github.com/scummvm/scummvm/commit/d0ce04c96824ab0c2957e33ceb830fb1d9caf8eb
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-21T13:02:13-07:00

Commit Message:
TSAGE: R2R - Fix CID 1004057

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 512ece5..8227a92 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5977,7 +5977,8 @@ void Scene1337::subCF31D() {
 			if ((_arrunkObj1337[1]._arr2[i]._field34 == 0) && (!subC2687(_arrunkObj1337[1]._arr3[0]._field34))) {
 				subC340B(&_arrunkObj1337[1]._arr1[tmpVal], &_arrunkObj1337[1]._arr2[i]);
 				found = true;
-			}
+				break;
+			} 
 		}
 	}
 
@@ -5987,8 +5988,10 @@ void Scene1337::subCF31D() {
 	tmpVal = subC274D(1);
 	int tmpVal2 = subC331B(1);
 
-	if ((tmpVal != -1) && ( tmpVal2 != -1))
+	if ((tmpVal != -1) && ( tmpVal2 != -1)) {
 		subC358E(&_arrunkObj1337[1]._arr1[tmpVal], tmpVal2);
+		found = true;
+	}
 
 	if (found)
 		return;






More information about the Scummvm-git-logs mailing list