[Scummvm-git-logs] scummvm branch-2-6 -> 157b60e3d47b7701e94c2af4f9b8798c954d9133

[antoniou79]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
19c6275753 BLADERUNNER: Fix bad dialogue entry for Italian localization
157b60e3d4 BLADERUNNER: Fix regression for toggling clue privacy


Commit: 19c627575343b4b1b8d6509decb7f74d4fbf14ee
    https://github.com/scummvm/scummvm/commit/19c627575343b4b1b8d6509decb7f74d4fbf14ee
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-07-15T22:39:10+03:00

Commit Message:
BLADERUNNER: Fix bad dialogue entry for Italian localization

AUTOMOBILI should be C.C.S.R.

Changed paths:
    engines/bladerunner/dialogue_menu.cpp


diff --git a/engines/bladerunner/dialogue_menu.cpp b/engines/bladerunner/dialogue_menu.cpp
index 12490999e00..85a1ed46513 100644
--- a/engines/bladerunner/dialogue_menu.cpp
+++ b/engines/bladerunner/dialogue_menu.cpp
@@ -115,10 +115,16 @@ bool DialogueMenu::addToList(int answer, bool done, int priorityPolite, int prio
 // Original uses incorrect spelling for entry id 1020: DRAGONFLY JEWERLY
 	const Common::String &text = _textResource->getText(answer);
 #else
-// fix spelling or entry id 1020 to DRAGONFLY JEWELRY in English version
 	const char *answerTextCP = _textResource->getText(answer);
 	if (_vm->_language == Common::EN_ANY && answer == 1020 && strcmp(answerTextCP, "DRAGONFLY JEWERLY") == 0) {
+		// fix spelling or entry id 1020 to DRAGONFLY JEWELRY in English version
 		answerTextCP = "DRAGONFLY JEWELRY";
+	} else if (_vm->_language == Common::IT_ITA && answer == 180 && strcmp(answerTextCP, "AUTOMOBILI") == 0) {
+		// fix bad dialogue entry id 180 for Italian version.
+		// The entry is supposed to be Grigorian's organization name (which is CARS in English, but CCSR in Italian)
+		// However, the original localization has it as "AUTOMOBILI" which is literally "cars" and results in confusion.
+		// The other official localizations do not have this issue.
+		answerTextCP = "C.C.S.R.";
 	}
 	const Common::String &text = answerTextCP;
 #endif // BLADERUNNER_ORIGINAL_BUGS


Commit: 157b60e3d47b7701e94c2af4f9b8798c954d9133
    https://github.com/scummvm/scummvm/commit/157b60e3d47b7701e94c2af4f9b8798c954d9133
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-07-15T22:39:25+03:00

Commit Message:
BLADERUNNER: Fix regression for toggling clue privacy

This KIA hotkey was not considered when switching to the ScummVM keymapper

Changed paths:
    engines/bladerunner/bladerunner.cpp
    engines/bladerunner/bladerunner.h
    engines/bladerunner/metaengine.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index ced802611e7..0947b8cca27 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
 #include "bladerunner/bladerunner.h"
 
 #include "bladerunner/actor.h"
@@ -1468,6 +1467,8 @@ void BladeRunnerEngine::handleEvents() {
 			}
 			switch ((BladeRunnerEngineMappableAction)event.customType) {
 			case kMpActionToggleCombat:
+				// fall through
+			case kMpActionToggleCluePrivacy:
 				handleMouseAction(event.mouse.x, event.mouse.y, false, false);
 				break;
 
@@ -1513,6 +1514,8 @@ void BladeRunnerEngine::handleEvents() {
 			if (!event.kbdRepeat) {
 				switch ((BladeRunnerEngineMappableAction)event.customType) {
 				case kMpActionToggleCombat:
+					// fall through
+				case kMpActionToggleCluePrivacy:
 					handleMouseAction(event.mouse.x, event.mouse.y, false, true);
 					break;
 
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index cd2efb101a0..541b9efc22c 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -332,7 +332,8 @@ public:
 		kMpActionScrollUp,                     // ScummVM addition (scroll list up)
 		kMpActionScrollDown,                   // ScummVM addition (scroll list down)
 		kMpConfirmDlg,                         // default <Return> or <KP_Enter>
-		kMpDeleteSelectedSvdGame               // default <Delete> or <KP_Period>
+		kMpDeleteSelectedSvdGame,              // default <Delete> or <KP_Period>
+		kMpActionToggleCluePrivacy             // default <right click>
 	};
 
 private:
diff --git a/engines/bladerunner/metaengine.cpp b/engines/bladerunner/metaengine.cpp
index f04002d1363..cd00e38fafb 100644
--- a/engines/bladerunner/metaengine.cpp
+++ b/engines/bladerunner/metaengine.cpp
@@ -216,6 +216,14 @@ Common::KeymapArray BladeRunnerMetaEngine::initKeymaps(const char *target) const
 	act->addDefaultInputMapping("JOY_DOWN");
 	kiaOnlyKeymap->addAction(act);
 
+	// I18N: This keymap allows (in KIA only) for a clue to be set as private or public
+	// (only when the KIA is upgraded).
+	act = new Action("KIATOGGLECLUEPRIVACY", _("Toggle Clue Privacy"));
+	act->setCustomEngineActionEvent(BladeRunnerEngine::kMpActionToggleCluePrivacy);
+	act->addDefaultInputMapping("MOUSE_RIGHT");
+	act->addDefaultInputMapping("JOY_RIGHT_SHOULDER");
+	kiaOnlyKeymap->addAction(act);
+
 	// I18N: This keymap opens KIA's HELP tab.
 	// In Blade Runner's official localizations, there is a description of this keymap
 	// on the KIA Help Page, under Keyboard Shortcuts. In the English version it is