[Scummvm-cvs-logs] scummvm master -> 6fa1b6fd4f3e5c2596774da497ed6d273829692a

[dreammaster]

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:
6fa1b6fd4f TSAGE: #if 0 out the uninitialised variable switch block


Commit: 6fa1b6fd4f3e5c2596774da497ed6d273829692a
    https://github.com/scummvm/scummvm/commit/6fa1b6fd4f3e5c2596774da497ed6d273829692a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-31T17:48:28-07:00

Commit Message:
TSAGE: #if 0 out the uninitialised variable switch block

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 7c9c541..e9dcb9b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -8268,9 +8268,10 @@ void Scene1550::dispatch() {
 	if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == 15) && (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == 16)) {
 		R2_GLOBALS._player._shade = 0;
 
-		// WORKAROUND: Original game contains a switch based on an uninitialized variable.
-		// The switch is being left in place, but with a fixed switch value of zero, in case
-		// we can ever figure out what the original programmers intended the value to come from
+		// NOTE: Original game contains a switch based on an uninitialized variable.
+		// We're leaving this code here, but ifdef'ed out, in case we can ever figure out 
+		// what the original programmers intended the value to come from
+#if 0
 		int missingVariable = 0;
 		switch (missingVariable) {
 		case 144:
@@ -8292,6 +8293,7 @@ void Scene1550::dispatch() {
 		default:
 			break;
 		}
+#endif
 	}
 
 	if (_field412 != 0)