[Scummvm-git-logs] scummvm master -> 3f3a80089acc5d750c059f40a776fbc77a7fb634

[sev-]

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:
3f3a80089a WINTERMUTE: Add "Red Comrades 0.2: Operation F." demos


Commit: 3f3a80089acc5d750c059f40a776fbc77a7fb634
    https://github.com/scummvm/scummvm/commit/3f3a80089acc5d750c059f40a776fbc77a7fb634
Author: lb_ii (lolbot_iichan at mail.ru)
Date: 2020-10-11T14:35:51+02:00

Commit Message:
WINTERMUTE: Add "Red Comrades 0.2: Operation F." demos

This adds detection & keymaps for "Red Comrades 0.2: Operation F."
fangame.
Project site: https://vk.com/petkafans
Forum thread: https://petka.ucoz.com/forum/6-369-1
Download link 1:
https://www.dropbox.com/s/emyuw64c9u5zf40/Petka02_demo1.zip?dl=0
Download link 2:
https://www.dropbox.com/s/72bz2prnuxej7j0/P15_demo_0007.zip

Changed paths:
    engines/wintermute/detection_tables.h
    engines/wintermute/keymapper_tables.h


diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index b07a8c35b0..80b4955ec5 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -107,6 +107,7 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{"palladion",       "Palladion"},
 	{"papasdaughters1", "Papa's Daughters"},
 	{"papasdaughters2", "Papa's Daughters Go to the Sea"},
+	{"petka02", "Red Comrades 0.2: Operation F."},
 	{"pigeons",         "Pigeons in the Park"},
 	{"pizzamorgana",    "Pizza Morgana: Episode 1 - Monsters and Manipulations in the Magical Forest"},
 	{"polechudes",      "Pole Chudes"},
@@ -1549,6 +1550,14 @@ static const WMEGameDescription gameDescriptions[] = {
 	WME_WINENTRY("papasdaughters2", "",
 		WME_ENTRY1s("data.dcp", "8f7dfc4b46c01318ba2bd8e1d79a0edb", 107690073), Common::RU_RUS, ADGF_UNSTABLE, WME_HEROCRAFT),
 
+	// Red Comrades 0.2: Operation F. (Fan game) (Demo 2015)
+	WME_WINENTRY("petka02", "Demo 2015",
+		WME_ENTRY1s("data.dcp", "aeba8e75c26625d744f866813450c1d4", 108623057), Common::RU_RUS, ADGF_UNSTABLE | ADGF_DEMO, WME_1_9_1),
+
+	// Red Comrades 0.2: Operation F. (Fan game) (Demo 2017)
+	WME_WINENTRY("petka02", "Demo 2017",
+		WME_ENTRY1s("data.dcp", "20d138270fd7552be9c1959cbfb8bcd7", 29081611), Common::RU_RUS, ADGF_UNSTABLE | ADGF_DEMO, WME_1_9_3),
+
 	// Pigeons in the Park
 	WME_WINENTRY("pigeons", "",
 		WME_ENTRY1s("data.dcp", "9143a5b6ff8206aefe3c4c643add3ec7", 2611100), Common::EN_ANY, ADGF_UNSTABLE, WME_1_8_1),
diff --git a/engines/wintermute/keymapper_tables.h b/engines/wintermute/keymapper_tables.h
index 2fb57b171c..8ae95be730 100644
--- a/engines/wintermute/keymapper_tables.h
+++ b/engines/wintermute/keymapper_tables.h
@@ -117,7 +117,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
 		gameId == "dreamcat" ||
 		gameId == "openquest"
 	) {
-		act = new Action("LOOK", _("Look At"));
+		act = new Action("LOOK", _("Look at"));
 		act->setKeyEvent(KeyState(KEYCODE_l, 'l'));
 		act->addDefaultInputMapping("l"); // original keyboard
 		act->addDefaultInputMapping("JOY_UP"); // extra joy
@@ -1165,6 +1165,71 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
 		act->addDefaultInputMapping("DOWN"); // extra keyboard
 		act->addDefaultInputMapping("JOY_DOWN"); // extra joy
 		gameKeyMap->addAction(act);
+	} else if (gameId == "petka02") {
+		act = new Action("INV", _("Show inventory"));
+		act->setKeyEvent(KeyState(KEYCODE_i, 'i'));
+		act->addDefaultInputMapping("i"); // original keyboard
+		act->addDefaultInputMapping("MOUSE_MIDDLE"); // extra mouse
+		act->addDefaultInputMapping("JOY_UP"); // extra joy
+		gameKeyMap->addAction(act);
+
+		act = new Action("MAP", _("Show map"));
+		act->setKeyEvent(KeyState(KEYCODE_m, 'm'));
+		act->addDefaultInputMapping("TAB"); // original keyboard
+		act->addDefaultInputMapping("F1"); // original keyboard
+		act->addDefaultInputMapping("m"); // original keyboard
+		act->addDefaultInputMapping("JOY_DOWN"); // extra joy
+		gameKeyMap->addAction(act);
+
+		act = new Action("LOOK", _("Look at"));
+		act->setKeyEvent(KeyState(KEYCODE_l, 'l'));
+		act->addDefaultInputMapping("1"); // original keyboard
+		act->addDefaultInputMapping("l"); // original keyboard
+		gameKeyMap->addAction(act);
+
+		act = new Action("WALK", _("Walk to"));
+		act->setKeyEvent(KeyState(KEYCODE_w, 'w'));
+		act->addDefaultInputMapping("2"); // original keyboard
+		act->addDefaultInputMapping("w"); // original keyboard
+		gameKeyMap->addAction(act);
+
+		act = new Action("PICK", _("Pick up"));
+		act->setKeyEvent(KeyState(KEYCODE_g, 'g'));
+		act->addDefaultInputMapping("3"); // original keyboard
+		act->addDefaultInputMapping("g"); // original keyboard
+		gameKeyMap->addAction(act);
+
+		act = new Action("USE", _("Use"));
+		act->setKeyEvent(KeyState(KEYCODE_u, 'u'));
+		act->addDefaultInputMapping("4"); // original keyboard
+		act->addDefaultInputMapping("u"); // original keyboard
+		gameKeyMap->addAction(act);
+
+		act = new Action("TALK", _("Talk to"));
+		act->setKeyEvent(KeyState(KEYCODE_t, 't'));
+		act->addDefaultInputMapping("5"); // original keyboard
+		act->addDefaultInputMapping("t"); // original keyboard
+		gameKeyMap->addAction(act);
+
+		act = new Action("VICH", _("Use Chapayev"));
+		act->setKeyEvent(KeyState(KEYCODE_c, 'c'));
+		act->addDefaultInputMapping("6"); // original keyboard
+		act->addDefaultInputMapping("c"); // original keyboard
+		gameKeyMap->addAction(act);
+
+		Common::String extra = ConfMan.get("extra", target);
+		if (extra.hasSuffix("2015")) {
+			act = new Action("WTF", _("???"));
+			act->setKeyEvent(KeyState(KEYCODE_q, 'q'));
+			act->addDefaultInputMapping("q"); // original keyboard
+			//TODO: extra joy control, e.g. "JOY_R+JOY_A"
+			gameKeyMap->addAction(act);
+
+			act = new Action("DBGTXT", _("Debug print"));
+			act->setKeyEvent(KEYCODE_BACKSPACE);
+			act->addDefaultInputMapping("BACKSPACE"); // original keyboard
+			gameKeyMap->addAction(act);
+		}
 	} else if (gameId == "pizzamorgana") {
 		act = new Action("ACTNXT", _("Next action"));
 		act->setMouseWheelUpEvent();