[Scummvm-cvs-logs] scummvm master -> 94871e9341ac54d560fd5eb71926ddb68210f814

Strangerke Strangerke at scummvm.org
Sun Dec 1 10:14:09 CET 2013


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

Summary:
94871e9341 TAGE: R2R - Scene 1337 - Get rid of subD195F()


Commit: 94871e9341ac54d560fd5eb71926ddb68210f814
    https://github.com/scummvm/scummvm/commit/94871e9341ac54d560fd5eb71926ddb68210f814
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-01T01:13:01-08:00

Commit Message:
TAGE: R2R - Scene 1337 - Get rid of subD195F()

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 945457e..e2560aa 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5542,6 +5542,7 @@ void Scene1337::subPostInit() {
 void Scene1337::suggestInstructions() {
 	if (R2_GLOBALS._v57709 > 0)
 		subD1917();
+
 	if (MessageDialog::show(NEED_INSTRUCTIONS, NO_MSG, YES_MSG) == 0) {
 		if (R2_GLOBALS._v57709 == 0)
 			subD18F5();
@@ -6822,15 +6823,17 @@ void Scene1337::subD183F(int arg1, int arg2) {
 			R2_GLOBALS._v5780E = 1;
 	}
 
+	// The original was using an intermediate function to call setCursorData.
+	// It has been removed to improve readability
 	if (R2_GLOBALS._v5780E == 1) {
 		R2_GLOBALS._v57810 = 200;
-		subD195F(1, 4);
+		setCursorData(5, 1, 4);
 	} else if (R2_GLOBALS._v5780E == 2) {
 		R2_GLOBALS._v57810 = 300;
-		subD195F(1, 5);
+		setCursorData(5, 1, 5);
 	} else {
 		R2_GLOBALS._v57810 = 0;
-		subD195F(0, 0);
+		setCursorData(5, 0, 0);
 	}
 }
 
@@ -6868,8 +6871,11 @@ void Scene1337::subD18F5() {
 void Scene1337::subD1917() {
 	if (R2_GLOBALS._v57709 != 0) {
 		R2_GLOBALS._v57709--;
-		if (R2_GLOBALS._v57709 != 0)
-			subD195F(_cursorCurStrip, _cursorCurFrame);
+		if (R2_GLOBALS._v57709 != 0) {
+			// The original was using an intermediate function to call setCursorData.
+			// It has been removed to improve readability
+			setCursorData(5, _cursorCurStrip, _cursorCurFrame);
+		}
 	}
 }
 
@@ -6880,10 +6886,6 @@ void Scene1337::subD1940(bool flag) {
 		--R2_GLOBALS._v5780C;
 }
 
-void Scene1337::subD195F(int arg1, int arg2) {
-	setCursorData(5, arg1, arg2);
-}
-
 void Scene1337::subD1975(int arg1, int arg2) {
 	warning("STUBBED lvl2 Scene1337::subD1975()");
 }
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 2b95bc2..0d4cf59 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -376,7 +376,6 @@ public:
 	void subD18F5();
 	void subD1917();
 	void subD1940(bool flag);
-	void subD195F(int arg1, int arg2);
 	void subD1975(int arg1, int arg2);
 	void subD1A48(int arg1);
 






More information about the Scummvm-git-logs mailing list