[Scummvm-cvs-logs] scummvm master -> 82e0045a30174d44bba0329ed51fb6540b0b8a14

Strangerke Strangerke at scummvm.org
Wed Nov 20 23:07:03 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:
82e0045a30 TSAGE: R2R - Document a fix, remove useless braces


Commit: 82e0045a30174d44bba0329ed51fb6540b0b8a14
    https://github.com/scummvm/scummvm/commit/82e0045a30174d44bba0329ed51fb6540b0b8a14
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-20T14:05:19-08:00

Commit Message:
TSAGE: R2R - Document a fix, remove useless braces

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 a7a00f6..2d95799 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -14967,11 +14967,12 @@ void Scene1950::enterArea() {
 	switch (R2_GLOBALS._flubMazeEntryDirection) {
 	case 0:
 		_sceneMode = 1950;
-		if (R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0) {
+		if (R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0)
+			// The original uses CURSOR_ARROW. CURSOR_WALK is much more coherent
 			R2_GLOBALS._player.enableControl(CURSOR_WALK);
-		} else {
+		else
 			setAction(&_sequenceManager, this, 1950, &R2_GLOBALS._player, NULL);
-		}
+
 		break;
 	case 1: {
 		_sceneMode = R2_GLOBALS._flubMazeEntryDirection;






More information about the Scummvm-git-logs mailing list