[Scummvm-git-logs] scummvm master -> 0d7acd38e23a97aada77e02953a07dccaf39c73c

[sev-]

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:
11c0e2638b AGS: Fix linking with plugins enabled
0d7acd38e2 AGS: Remove duplicate detection entry


Commit: 11c0e2638b9c6eb4e09e21aacbed2add208a0c7d
    https://github.com/scummvm/scummvm/commit/11c0e2638b9c6eb4e09e21aacbed2add208a0c7d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-03-05T02:07:06+01:00

Commit Message:
AGS: Fix linking with plugins enabled

Changed paths:
    engines/ags/game_scanner.cpp


diff --git a/engines/ags/game_scanner.cpp b/engines/ags/game_scanner.cpp
index 998e4f085c..0a496f3f79 100644
--- a/engines/ags/game_scanner.cpp
+++ b/engines/ags/game_scanner.cpp
@@ -33,10 +33,6 @@
 #include "common/hashmap.h"
 #include "common/md5.h"
 
-#ifdef DYNAMIC_MODULES
-#include "ags/detection_tables.h"
-#endif
-
 namespace AGS3 {
 
 extern bool define_gamedata_location(const AGS::Shared::String &exe_path);
@@ -149,7 +145,7 @@ void GameScanner::scanFile(const Common::String &filename) {
 
 		_games.push_back(e);
 	}
-} 
+}
 
 Common::String GameScanner::convertGameNameToId(const Common::String &name) {
 	Common::String result;


Commit: 0d7acd38e23a97aada77e02953a07dccaf39c73c
    https://github.com/scummvm/scummvm/commit/0d7acd38e23a97aada77e02953a07dccaf39c73c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-03-05T02:09:00+01:00

Commit Message:
AGS: Remove duplicate detection entry

Changed paths:
    engines/ags/detection_tables.h


diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index 77b93c2a7b..75f7f562da 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -158,7 +158,7 @@ const PlainGameDescriptor GAME_NAMES[] = {
 	{ "blackwell3", "The Blackwell Convergence" },
 	{ "blackwell4", "The Blackwell Deception" },
 	{ "blackwell5", "The Blackwell Epiphany" },
-	{ "captaindisaster", "Captain Disaster" },
+	{ "captaindisaster", "Captain Disaster in Death Has a Million Stomping Boots" },
 	{ "charnelhousetrilogy", "The Charnel House Trilogy" },
 	{ "chronicleofinnsmouth", "Chronicle of Innsmouth" },
 	{ "crystalshardadventurebundle", "Crystal Shard Adventure Bundle" },
@@ -402,7 +402,6 @@ const PlainGameDescriptor GAME_NAMES[] = {
 	{ "calsoon2", "Calsoon 2" },
 	{ "capricorn", "CAPRICORN" },
 	{ "captaincringe", "Captain Cringe" },
-	{ "captaindisaster", "Captain Disaster in Death Has a Million Stomping Boots" },
 	{ "carrin", "Carrin" },
 	{ "carrotbobinzxspeccyworld", "Carrot Bob in ZX speccy world" },
 	{ "casablancathedayafter", "Casablanca The Day After" },