[Scummvm-cvs-logs] scummvm master -> c9115241dea8d1e741003da671e4d4df6d2ccf68

dreammaster dreammaster at scummvm.org
Sun Aug 25 22:50:55 CEST 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:
c9115241de TSAGE: Fix to the R2R scene 1550 junk display loop


Commit: c9115241dea8d1e741003da671e4d4df6d2ccf68
    https://github.com/scummvm/scummvm/commit/c9115241dea8d1e741003da671e4d4df6d2ccf68
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-08-25T13:49:49-07:00

Commit Message:
TSAGE: Fix to the R2R scene 1550 junk display loop

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



diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 7dac8aa..839895c 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -242,11 +242,6 @@ namespace Ringworld2 {
 #define SPEECH_TEXT 1
 #define SPEECH_VOICE 2
 
-#define k5A78C 15
-#define k5A78D 16
-#define k5A790 18
-#define k5A791 17
-
 class ScannerDialog;
 
 class Ringworld2Globals: public TsAGE2Globals {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index d277add..4ecb33e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -8990,7 +8990,7 @@ void Scene1550::enterArea() {
 
 	int di = 0;
 	int tmpIdx = 0;
-	for (int i = 0; i < 129 * 4; i += 4) {
+	for (int i = 0; i < 127 * 4; i += 4) {
 		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x == R2_GLOBALS._scene1550JunkLocations[i]) && 
 				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y == R2_GLOBALS._scene1550JunkLocations[i + 1]) && 
 				(R2_GLOBALS._scene1550JunkLocations[i + 2] != 0)) {
@@ -9006,10 +9006,10 @@ void Scene1550::enterArea() {
 				_junk[di].setPosition(Common::Point(150, 70));
 				_junk[di].setup(1562, 1, 1);
 
-				R2_GLOBALS._walkRegions.enableRegion(k5A78C);
-				R2_GLOBALS._walkRegions.enableRegion(k5A78D);
-				R2_GLOBALS._walkRegions.enableRegion(k5A790);
-				R2_GLOBALS._walkRegions.enableRegion(k5A791);
+				R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[2]);
+				R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[3]);
+				R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[6]);
+				R2_GLOBALS._walkRegions.enableRegion(scene1550JunkRegions[7]);
 
 				if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1550) {
 					_actor9.postInit();






More information about the Scummvm-git-logs mailing list