[Scummvm-git-logs] scummvm master -> 158dcecf55061308212c64fccad54c5520109587

[bluegr]

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:
5460526b77 BURIED: Cleanup
158dcecf55 GLK: ADRIFT: Add new entries - bugs #13179, #13184


Commit: 5460526b77fa952fa67f9dae2c6f200c109164c0
    https://github.com/scummvm/scummvm/commit/5460526b77fa952fa67f9dae2c6f200c109164c0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-01-04T03:28:16+02:00

Commit Message:
BURIED: Cleanup

Changed paths:
    engines/buried/environ/agent3_lair.cpp


diff --git a/engines/buried/environ/agent3_lair.cpp b/engines/buried/environ/agent3_lair.cpp
index 0201c0bffd6..aee649d7c4e 100644
--- a/engines/buried/environ/agent3_lair.cpp
+++ b/engines/buried/environ/agent3_lair.cpp
@@ -356,15 +356,16 @@ int LairEntry::onCharacter(Window *viewWindow, const Common::KeyState &character
 		}
 
 		// Watch out, some curse words in here
-		Common::String vulgarLangA = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_VULGAR_LANG_A) : "FUCKER";
-		Common::String vulgarLangB = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_VULGAR_LANG_B) : "SHITHEAD";
-		Common::String vulgarLangC = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_VULGAR_LANG_C) : "BITCH";
-		Common::String vulgarLangD = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_VULGAR_LANG_D) : "CUNT";
-		Common::String vulgarLangE = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_VULGAR_LANG_E) : "WHORE";
-		Common::String vulgarLangF = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_VULGAR_LANG_F) : "ASSHOLE";
-		Common::String vulgarLangG = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_VULGAR_LANG_G) : "TWAT";
-		Common::String vulgarLangH = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_VULGAR_LANG_H) : "FUCK";
-		Common::String vulgarLangI = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_VULGAR_LANG_I) : "SHIT";
+		bool newVersion = (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0));
+		Common::String vulgarLangA = newVersion ? _vm->getString(IDS_AL_VULGAR_LANG_A) : "FUCKER";
+		Common::String vulgarLangB = newVersion ? _vm->getString(IDS_AL_VULGAR_LANG_B) : "SHITHEAD";
+		Common::String vulgarLangC = newVersion ? _vm->getString(IDS_AL_VULGAR_LANG_C) : "BITCH";
+		Common::String vulgarLangD = newVersion ? _vm->getString(IDS_AL_VULGAR_LANG_D) : "CUNT";
+		Common::String vulgarLangE = newVersion ? _vm->getString(IDS_AL_VULGAR_LANG_E) : "WHORE";
+		Common::String vulgarLangF = newVersion ? _vm->getString(IDS_AL_VULGAR_LANG_F) : "ASSHOLE";
+		Common::String vulgarLangG = newVersion ? _vm->getString(IDS_AL_VULGAR_LANG_G) : "TWAT";
+		Common::String vulgarLangH = newVersion ? _vm->getString(IDS_AL_VULGAR_LANG_H) : "FUCK";
+		Common::String vulgarLangI = newVersion ? _vm->getString(IDS_AL_VULGAR_LANG_I) : "SHIT";
 
 		if (_passwordEntered == vulgarLangA || _passwordEntered == vulgarLangB || _passwordEntered == vulgarLangC ||
 				_passwordEntered == vulgarLangD || _passwordEntered == vulgarLangE || _passwordEntered == vulgarLangF ||
@@ -372,7 +373,7 @@ int LairEntry::onCharacter(Window *viewWindow, const Common::KeyState &character
 			liveText = _vm->getString(IDS_AGENT3_VIRUS_TEXT_A);
 			liveText += _passwordEntered;
 			liveText += _vm->getString(IDS_AGENT3_VIRUS_CURSOR);
-			liveText += (_vm->getVersion() >= MAKEVERSION(1, 0, 4, 0)) ? _vm->getString(IDS_AL_CASTRATION_TEXT) : "\nVULGAR LANGUAGE UNACCEPTABLE. CASTRATION TOOL ACTIVATED.";
+			liveText += newVersion ? _vm->getString(IDS_AL_CASTRATION_TEXT) : "\nVULGAR LANGUAGE UNACCEPTABLE. CASTRATION TOOL ACTIVATED.";
 			((SceneViewWindow  *)viewWindow)->displayLiveText(liveText, false);
 			_passwordIndex = 4;
 			_timerStart = 0;


Commit: 158dcecf55061308212c64fccad54c5520109587
    https://github.com/scummvm/scummvm/commit/158dcecf55061308212c64fccad54c5520109587
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-01-04T03:28:16+02:00

Commit Message:
GLK: ADRIFT: Add new entries - bugs #13179, #13184

Changed paths:
    engines/glk/adrift/detection_tables.h


diff --git a/engines/glk/adrift/detection_tables.h b/engines/glk/adrift/detection_tables.h
index 296d2a6e198..68be187e099 100644
--- a/engines/glk/adrift/detection_tables.h
+++ b/engines/glk/adrift/detection_tables.h
@@ -31,6 +31,7 @@ const PlainGameDescriptor ADRIFT_GAME_LIST[] = {
 
 	// English Games
 	{ "3monkeys", "Three Monkeys, One Cage" },
+	{ "adventurestrikes", "Adventure Strikes When You Least Expect It" },
 	{ "akron", "Akron" },
 	{ "albridgemanor", "Albridge Manor" },
 	{ "ascot", "The Ascot" },
@@ -264,6 +265,9 @@ const PlainGameDescriptor ADRIFT_GAME_LIST[] = {
 	{ "iadcprivateeye", "Private Eye" },
 	{ "iadcblood", "Fire in the Blood" },
 
+	// ADRIFT Hourglass Comp 2006
+	{ "ahc3minutes", "3 Minutes to Live" },
+
 	{ nullptr, nullptr }
 };
 
@@ -300,6 +304,7 @@ const PlainGameDescriptor ADRIFT5_GAME_LIST[] = {
 const GlkDetectionEntry ADRIFT_GAMES[] = {
 	// English Games
 	DT_ENTRY0("3monkeys", "dec34c282511b1eadfe231dbbb49f625", 79286),
+	DT_ENTRY0("adventurestrikes", "f5e18081fd6ec4955ed0665aee8580de", 3770),
 	DT_ENTRY0("akron", "2461ceeef3ef1eac15a2051a549b4402", 22258),
 	DT_ENTRY0("albridgemanor", "268003e454c4ade042d593af8397a490", 31353),
 	DT_ENTRY0("ascot", "01ed200d7aec907aa84ad4007c5b296b", 24494),
@@ -580,6 +585,9 @@ const GlkDetectionEntry ADRIFT_GAMES[] = {
 	DT_ENTRY0("iadcprivateeye", "3076b9f11acf2b1e377a31cd1a11c323", 236323),
 	DT_ENTRY0("iadcblood", "775404faa0d7973c1df537bd423a45d3", 100201),
 
+	// ADRIFT Hourglass Comp 2006
+	DT_ENTRY0("ahc3minutes", "0313370bb74005525ec96580f146d286", 13232),
+
 	DT_END_MARKER
 };