[Scummvm-git-logs] scummvm master -> f76f9cc7817e0d7ff54784aa06da31f40d446eac

[dreammaster]

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:
b180fc3623 AGS: Fix duplicated if block in AGSParallax plugin
f76f9cc781 AGS: Added detection entries


Commit: b180fc3623ff296717593262153bcb06d3cbbf9a
    https://github.com/scummvm/scummvm/commit/b180fc3623ff296717593262153bcb06d3cbbf9a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-03-12T18:59:57-08:00

Commit Message:
AGS: Fix duplicated if block in AGSParallax plugin

Changed paths:
    engines/ags/plugins/ags_parallax/ags_parallax.cpp


diff --git a/engines/ags/plugins/ags_parallax/ags_parallax.cpp b/engines/ags/plugins/ags_parallax/ags_parallax.cpp
index f8a4a7d762..c1664b3fb0 100644
--- a/engines/ags/plugins/ags_parallax/ags_parallax.cpp
+++ b/engines/ags/plugins/ags_parallax/ags_parallax.cpp
@@ -76,14 +76,12 @@ int64 AGSParallax::AGS_EngineOnEvent(int event, NumberPtr data) {
 	if (event == AGSE_PREGUIDRAW) {
 		Draw(true);
 	} else if (event == AGSE_PRESCREENDRAW) {
+		// Get screen size and then draw
+		_engine->GetScreenDimensions(&_screenWidth, &_screenHeight, &_screenColorDepth);
 		Draw(false);
 	} else if (event == AGSE_ENTERROOM) {
 		// Reset all _sprites
 		clear();
-	} else if (event == AGSE_PRESCREENDRAW) {
-		// Get screen size once here
-		_engine->GetScreenDimensions(&_screenWidth, &_screenHeight, &_screenColorDepth);
-		_engine->UnrequestEventHook(AGSE_PRESCREENDRAW);
 	} else if (event == AGSE_RESTOREGAME) {
 		Serializer s(_engine, data, true);
 		syncGame(s);


Commit: f76f9cc7817e0d7ff54784aa06da31f40d446eac
    https://github.com/scummvm/scummvm/commit/f76f9cc7817e0d7ff54784aa06da31f40d446eac
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-03-12T19:05:50-08:00

Commit Message:
AGS: Added detection entries

Changed paths:
    engines/ags/detection_tables.h


diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index b66bbcfbd1..8da5e26a7b 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -302,6 +302,7 @@ const PlainGameDescriptor GAME_NAMES[] = {
 	{ "aprofoundjourney", "A Profound Journey" },
 	{ "archeos", "Archeos" },
 	{ "arewethereyet", "Are we there yet?" },
+	{ "aroomwithoutyou", "A Room Without You In It" },
 	{ "armageddonmargaret", "Armageddon Margaret" },
 	{ "asecondface", "A SECOND FACE" },
 	{ "ashortnightmare", "A Short Nightmare" },
@@ -722,7 +723,7 @@ const PlainGameDescriptor GAME_NAMES[] = {
 	{ "johnjebediahgunelisoladisepheret", "John Jebediah Gun e l'Isola di Sepheret" },
 	{ "johnlosthiskey", "John Lost his key" },
 	{ "johnnyrocket", "Johnny_Rocket" },
-	{ "johnsinclairvoodooinlondon", "John Sinclair - Voodoo in London" },
+	{ "johnsinclair", "John Sinclair - Voodoo in London" },
 	{ "jonnysmallvalley", "Jonny Smallvalley" },
 	{ "jorry", "Jorry" },
 	{ "juliusdangerous2", "Julius Dangerous 2" },
@@ -1933,6 +1934,8 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	GAME_ENTRY("archeos", "archeos.exe", "2ff048659aaefd20d342db6428a5f1a0", 6661410),
 	GAME_ENTRY("archeos", "archeos.ags", "050b3e5c5486fb6b977712cb4e4d6058", 4217618),
 	GAME_ENTRY("arewethereyet", "arewethereyet.exe", "f120690b506dd63cd7d1112ea6af2f77", 1054672),
+	GAME_ENTRY("aroomwithoutyou", "aroomwithoutyou.ags", "34ba844fe761f8a9da2cf1076c30d847", 27163303),
+	GAME_ENTRY("aroomwithoutyou", "aroomwithoutyou.exe", "7ddb9e776648faed5a51170d087074e9", 29650615),
 	GAME_ENTRY("armageddonmargaret", "am_game.exe", "06a03fe35791b0578068ab1873455463", 3640885),
 	GAME_ENTRY("armageddonmargaret", "armageddon margaret.exe", "3128b9f90e2f954ba704414ae854d10b", 2951568),
 	GAME_ENTRY("asecondface", "eye of geltz.exe", "0e32c4b3380e286dc0cea8550f1c045e", 7061019),
@@ -2352,7 +2355,8 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	GAME_ENTRY("johnjebediahgunelisoladisepheret", "JJG.exe", "a28cb95e1769ba1bfa48f850390746c2", 88957123),
 	GAME_ENTRY("johnlosthiskey", "Newgame.exe", "0b7529a76f38283d6e850b8d56526fc1", 1453831),
 	GAME_ENTRY("johnnyrocket", "Rocket.exe", "a524cbb1c51589903c4043b98917f1d9", 10366294),
-	GAME_ENTRY("johnsinclairvoodooinlondon", "John Sinclair - Voodoo in London.exe", "d72e72697a755c7de395b0f6c8cbbf0d", 56795991),
+	GAME_ENTRY("johnsinclair", "John Sinclair - Voodoo in London.exe", "d72e72697a755c7de395b0f6c8cbbf0d", 56795991),
+	GAME_ENTRY("johnsinclair", "John Sinclair- Voodoo in London.exe", "68c4cdee67c40bf96cf78e11f9073ddd", 238169392),
 	GAME_ENTRY("jonnysmallvalley", "Jonny Smallvalley.exe", "01d0e6bd812abaa307bcb10fc2193416", 34437869),
 	GAME_ENTRY("juliusdangerous2", "Julius Dangerous 2.exe", "e2d4a98de69b1f8e6462c387710a441a", 146931732),
 	GAME_ENTRY("juliusdangerousandthespaceinvaders", "Julius Dangerous.exe", "ddaf3807f1fe16b2813ff832b4fb471a", 83137140),