[Scummvm-cvs-logs] scummvm master -> 3134e4a4ba3067815364a1c1ca0ccf441a463782

[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:
3134e4a4ba TSAGE: Fixes for R2R bridge console scanner


Commit: 3134e4a4ba3067815364a1c1ca0ccf441a463782
    https://github.com/scummvm/scummvm/commit/3134e4a4ba3067815364a1c1ca0ccf441a463782
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-08-11T18:54:30-07:00

Commit Message:
TSAGE: Fixes for R2R bridge console scanner

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 8e4da2b..8d35fc7 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3887,7 +3887,7 @@ Scene325::Scene325(): SceneExt() {
 	_field412 = 7;
 	_iconFontNumber = 50;
 	_field416 = _field418 = 0;
-	_field41A = _field41C = _field41E = _field420 = 0;
+	_field41A = _field41C = _field41E = _scannerLocation = 0;
 	_soundCount = _soundIndex = 0;
 
 	for (int idx = 0; idx < 10; ++idx)
@@ -3922,7 +3922,7 @@ void Scene325::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_field41A);
 	s.syncAsSint16LE(_field41C);
 	s.syncAsSint16LE(_field41E);
-	s.syncAsSint16LE(_field420);
+	s.syncAsSint16LE(_scannerLocation);
 	s.syncAsSint16LE(_soundCount);
 	s.syncAsSint16LE(_soundIndex);
 
@@ -4025,17 +4025,17 @@ void Scene325::signal() {
 				if (v != 13) {
 					setMessage(328, v);
 				} else {
-					_field420 = 864;
+					_scannerLocation = 864;
 
 					_object12.postInit();
-					_object2.setup(326, 4, 1);
+					_object12.setup(326, 4, 1);
 					_object12.setPosition(Common::Point(149, 128));
 					_object12.fixPriority(20);
 
-					_object13.postInit();
-					_object13.setup(326, 4, 2);
-					_object13.setPosition(Common::Point(149, 22 + (int)(_field420 * ADJUST_FACTOR)));
-					_object13.fixPriority(21);
+					_scannerTab.postInit();
+					_scannerTab.setup(326, 4, 2);
+					_scannerTab.setPosition(Common::Point(149, 22 + (int)(_scannerLocation * ADJUST_FACTOR)));
+					_scannerTab.fixPriority(21);
 
 					_object10.postInit();
 					_object10.setup(326, 1, 1);
@@ -4283,7 +4283,7 @@ void Scene325::consoleAction(int id) {
 			_icon4.hideIcon();
 
 			_object12.remove();
-			_object13.remove();
+			_scannerTab.remove();
 			_object10.remove();
 			_object1.remove();
 			_object2.remove();
@@ -4336,7 +4336,7 @@ void Scene325::consoleAction(int id) {
 		case 18:
 		case 19:
 		case 20:
-			if (_field420) {
+			if (_scannerLocation) {
 				R2_GLOBALS._player.disableControl();
 				_field41A = 1296;
 				_field41E = 1;
@@ -4356,7 +4356,7 @@ void Scene325::consoleAction(int id) {
 		case 18:
 		case 19:
 		case 20:
-			if (_field420 < 1620) {
+			if (_scannerLocation < 1620) {
 				R2_GLOBALS._player.disableControl();
 				_field41A = 1296;
 				_field41E = -1;
@@ -4452,21 +4452,21 @@ void Scene325::dispatch() {
 
 		if (yp >= 30) {
 			yp -= 12;
-			--_field420;
+			--_scannerLocation;
 			flag = true;
 		}
 		if (yp <= 10) {
 			yp += 12;
-			++_field420;
+			++_scannerLocation;
 			flag = true;
 		}
-		_object3.setPosition(Common::Point(149, (int)(_field420 * ADJUST_FACTOR) + 22));
+		_scannerTab.setPosition(Common::Point(149, 22 + (int)(_scannerLocation * ADJUST_FACTOR)));
 
 		for (int idx = 0; idx < 4; ++idx)
 			_objList[idx].remove();
 
 		if (flag) {
-			int v = _field420 - 758;
+			int v = _scannerLocation - 758;
 			_object10.setFrame((v++ <= 0) ? 1 : v);
 			_object1.setFrame((v++ <= 0) ? 1 : v);
 			_object2.setFrame((v++ <= 0) ? 1 : v);
@@ -4506,7 +4506,7 @@ void Scene325::dispatch() {
 			R2_GLOBALS._sound3.stop();
 			_field41C = 0;
 
-			if (_field420 == 756) {
+			if (_scannerLocation == 756) {
 				R2_GLOBALS._player.disableControl();
 				R2_GLOBALS._events.setCursor(CURSOR_USE);
 				_sceneMode = 12;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index bad946f..bc30743 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -451,7 +451,7 @@ private:
 	Common::String parseMessage(const Common::String &msg);
 public:
 	int _field412, _iconFontNumber, _field416, _field418;
-	int _field41A, _field41C, _field41E, _field420;
+	int _field41A, _field41C, _field41E, _scannerLocation;
 	int _soundCount, _soundIndex;
 	int _soundQueue[10];
 	SpeakerQuinn _quinnSpeaker;
@@ -459,7 +459,7 @@ public:
 	SceneHotspot _background, _item2;
 	SceneObject _object1, _object2, _object3, _object4, _object5;
 	SceneObject _object6, _object7, _object8, _object9, _object10;
-	SceneObject _object11, _object12, _object13;
+	SceneObject _object11, _object12, _scannerTab;
 	SceneObject _objList[4];
 	Icon _icon1, _icon2, _icon3, _icon4, _icon5, _icon6;
 	ASoundExt _sound1;