[Scummvm-git-logs] scummvm master -> 4af463476b1ded9dd94ee53d19dc071a2c4a4753

[antoniou79]

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:
4af463476b BLADERUNNER: Fix wrong order for GPS map selection


Commit: 4af463476b1ded9dd94ee53d19dc071a2c4a4753
    https://github.com/scummvm/scummvm/commit/4af463476b1ded9dd94ee53d19dc071a2c4a4753
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-11-08T16:28:18+02:00

Commit Message:
BLADERUNNER: Fix wrong order for GPS map selection

Changed paths:
    engines/bladerunner/ui/spinner.cpp


diff --git a/engines/bladerunner/ui/spinner.cpp b/engines/bladerunner/ui/spinner.cpp
index 4e7379d..c6d42b0 100644
--- a/engines/bladerunner/ui/spinner.cpp
+++ b/engines/bladerunner/ui/spinner.cpp
@@ -105,15 +105,24 @@ int Spinner::chooseDestination(int loopId, bool immediately) {
 	_destinations = nullptr;
 	int spinnerLoopId = 4;
 
-	if (mapmask & 1) {
-		_destinations = getDestinationsNear();
-		spinnerLoopId = 0;
+	// mapmask determines which map version will be displayed
+	// Depending on which destinations are available, mapmaks will have value:
+	// 1: For the near view (first chapter locations, and animoid row for some reason)
+	// 3: For medium view locations (includes the near view ones)
+	// 7: For far view locations (includes all the previous ones)
+	// This values are determined in mapmaskv table
+	//
+	// Since the checks below use bitwise AND, we need to check in order
+	// from the "far" version to the "near" version
+	if (mapmask & 4) {
+		_destinations = getDestinationsFar();
+		spinnerLoopId = 4;
 	} else if (mapmask & 2) {
 		_destinations = getDestinationsMedium();
 		spinnerLoopId = 2;
-	} else if (mapmask & 4) {
-		_destinations = getDestinationsFar();
-		spinnerLoopId = 4;
+	} else if (mapmask & 1) {
+		_destinations = getDestinationsNear();
+		spinnerLoopId = 0;
 	} else {
 		return -1;
 	}