[Scummvm-cvs-logs] scummvm master -> 0cc0c404bf0d8c634f38268c1b022e99ab5d587a

Strangerke Strangerke at scummvm.org
Sat Jan 4 22:57:06 CET 2014


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:
0cc0c404bf TSAGE: R2R - Remove dead code in scene 1800


Commit: 0cc0c404bf0d8c634f38268c1b022e99ab5d587a
    https://github.com/scummvm/scummvm/commit/0cc0c404bf0d8c634f38268c1b022e99ab5d587a
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-01-04T13:56:07-08:00

Commit Message:
TSAGE: R2R - Remove dead code in scene 1800

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 0025d0b..075420a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -11491,16 +11491,7 @@ void Scene1800::signal() {
 		R2_GLOBALS._walkRegions.disableRegion(10);
 		R2_GLOBALS._walkRegions.disableRegion(11);
 		R2_GLOBALS.setFlag(63);
-
-		// The following check is completely dumb.
-		// Either an original bug, or dead code.
-		if (R2_GLOBALS.getFlag(63)) {
-			R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		} else {
-			_sceneMode = 10;
-			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-			_stripManager.start(545, this);
-		}
+		R2_GLOBALS._player.enableControl(CURSOR_WALK);
 		break;
 	case 1802:
 		R2_GLOBALS.clearFlag(14);






More information about the Scummvm-git-logs mailing list