From 9a4c0ae281e0b7b545360c6dbd347a432cdade12 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Thu, 15 Sep 2016 20:04:14 +0200 Subject: ENGINES: Normalize the getName() result of metaengines Also-By: Matthew Hoops --- engines/access/detection.cpp | 2 +- engines/avalanche/detection.cpp | 2 +- engines/bladerunner/detection.cpp | 2 +- engines/chewy/detection.cpp | 4 ++-- engines/cine/detection.cpp | 4 ++-- engines/composer/detection.cpp | 2 +- engines/cruise/detection.cpp | 4 ++-- engines/cryo/detection.cpp | 4 ++-- engines/draci/detection.cpp | 4 ++-- engines/drascula/detection.cpp | 4 ++-- engines/dreamweb/detection.cpp | 2 +- engines/fullpipe/detection.cpp | 4 ++-- engines/hopkins/detection.cpp | 4 ++-- engines/lab/detection.cpp | 2 +- engines/lastexpress/detection.cpp | 4 ++-- engines/lilliput/detection.cpp | 2 +- engines/lure/detection.cpp | 2 +- engines/mads/detection.cpp | 4 ++-- engines/mortevielle/detection.cpp | 2 +- engines/neverhood/detection.cpp | 4 ++-- engines/pink/detection.cpp | 4 ++-- engines/plumbers/detection.cpp | 2 +- engines/prince/detection.cpp | 6 +++--- engines/queen/detection.cpp | 2 +- engines/sci/detection.cpp | 6 ++++-- engines/sherlock/detection.cpp | 4 ++-- engines/sky/detection.cpp | 2 +- engines/sludge/detection.cpp | 4 ++-- engines/startrek/detection.cpp | 2 +- engines/supernova/detection.cpp | 2 +- engines/sword1/detection.cpp | 4 ++-- engines/sword2/sword2.cpp | 4 ++-- engines/sword25/detection.cpp | 2 +- engines/titanic/detection.cpp | 4 ++-- engines/toltecs/detection.cpp | 4 ++-- engines/tony/detection.cpp | 4 ++-- engines/toon/detection.cpp | 2 +- engines/touche/detection.cpp | 4 ++-- engines/tucker/detection.cpp | 2 +- engines/voyeur/detection.cpp | 2 +- engines/xeen/detection.cpp | 4 ++-- 41 files changed, 67 insertions(+), 65 deletions(-) diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp index 186fcbdf06..4e5ef84b06 100644 --- a/engines/access/detection.cpp +++ b/engines/access/detection.cpp @@ -90,7 +90,7 @@ public: } virtual const char *getName() const { - return "Access Engine"; + return "Access"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp index 7f3d4f88a8..81f9688ab6 100644 --- a/engines/avalanche/detection.cpp +++ b/engines/avalanche/detection.cpp @@ -83,7 +83,7 @@ public: } const char *getOriginalCopyright() const { - return "Avalanche Engine Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman."; + return "Avalanche (C) 1994-1995 Mike, Mark and Thomas Thurman."; } bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const; diff --git a/engines/bladerunner/detection.cpp b/engines/bladerunner/detection.cpp index 5293d76c97..4d61396955 100644 --- a/engines/bladerunner/detection.cpp +++ b/engines/bladerunner/detection.cpp @@ -63,7 +63,7 @@ BladeRunnerMetaEngine::BladeRunnerMetaEngine() const char *BladeRunnerMetaEngine::getName() const { - return "Blade Runner Engine"; + return "Blade Runner"; } const char *BladeRunnerMetaEngine::getOriginalCopyright() const { diff --git a/engines/chewy/detection.cpp b/engines/chewy/detection.cpp index 835322d137..b582e83607 100644 --- a/engines/chewy/detection.cpp +++ b/engines/chewy/detection.cpp @@ -119,11 +119,11 @@ public: } virtual const char *getName() const { - return "Chewy Engine"; + return "Chewy: Esc from F5"; } virtual const char *getOriginalCopyright() const { - return "Chewy Engine New Generation Software (C) 1995"; + return "Chewy: Esc from F5 (C) 1995 New Generation Software"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index f1636c902b..a41bc47bb0 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -89,11 +89,11 @@ public: } virtual const char *getName() const { - return "Cine"; + return "Cinematique evo 1"; } virtual const char *getOriginalCopyright() const { - return "Future Wars & Operation Stealth (C) Delphine Software"; + return "Cinematique evo 1 (C) Delphine Software"; } virtual Common::Error createInstance(OSystem *syst, Engine **engine) const { diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp index 7bb0e8d835..0ae0f1fd2e 100644 --- a/engines/composer/detection.cpp +++ b/engines/composer/detection.cpp @@ -486,7 +486,7 @@ public: } virtual const char *getName() const { - return "Magic Composer Engine"; + return "Magic Composer"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index 3dfd414fd2..4f63fd28e5 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -201,11 +201,11 @@ public: } virtual const char *getName() const { - return "CruisE"; + return "Cinematique evo 2"; } virtual const char *getOriginalCopyright() const { - return "Cruise for a Corpse (C) Delphine Software"; + return "Cinematique evo 2 (C) Delphine Software"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/cryo/detection.cpp b/engines/cryo/detection.cpp index 2ae01f41dd..2c59527dba 100644 --- a/engines/cryo/detection.cpp +++ b/engines/cryo/detection.cpp @@ -137,11 +137,11 @@ public: } virtual const char *getName() const { - return "Cryo Engine"; + return "Cryo"; } virtual const char *getOriginalCopyright() const { - return "Cryo Engine (C) Cryo Interactive"; + return "Cryo (C) Cryo Interactive"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index 9a76e3890c..63cd8a2c2b 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -88,11 +88,11 @@ public: } virtual const char *getName() const { - return "Draci"; + return "Draci Historie"; } virtual const char *getOriginalCopyright() const { - return "Copyright (C) 1995 NoSense"; + return "Draci Historie (C) 1995 NoSense"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index a1f2f3e117..56e1b35c73 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -344,11 +344,11 @@ public: } virtual const char *getName() const { - return "Drascula"; + return "Drascula: The Vampire Strikes Back"; } virtual const char *getOriginalCopyright() const { - return "Drascula Engine (C) 2000 Alcachofa Soft, (C) 1996 Digital Dreams Multimedia, (C) 1994 Emilio de Paz"; + return "Drascula: The Vampire Strikes Back (C) 2000 Alcachofa Soft, (C) 1996 Digital Dreams Multimedia, (C) 1994 Emilio de Paz"; } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const; diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp index 36af0c3811..ddaccc7f1e 100644 --- a/engines/dreamweb/detection.cpp +++ b/engines/dreamweb/detection.cpp @@ -76,7 +76,7 @@ public: } virtual const char *getName() const { - return "DreamWeb engine"; + return "DreamWeb"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp index 3144a0ebff..cb45ae9cd3 100644 --- a/engines/fullpipe/detection.cpp +++ b/engines/fullpipe/detection.cpp @@ -134,11 +134,11 @@ public: } virtual const char *getName() const { - return "Fullpipe Engine"; + return "Full Pipe"; } virtual const char *getOriginalCopyright() const { - return "Fullpipe Engine (C) Pipe Studio"; + return "Full Pipe (C) Pipe Studio"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp index ebefee6278..03d906ab4d 100644 --- a/engines/hopkins/detection.cpp +++ b/engines/hopkins/detection.cpp @@ -107,11 +107,11 @@ public: } virtual const char *getName() const { - return "Hopkins Engine"; + return "Hopkins FBI"; } virtual const char *getOriginalCopyright() const { - return "Hopkins FBI (C)1997-2003 MP Entertainment"; + return "Hopkins FBI (c) 1997-2003 MP Entertainment"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp index 9ce8519ec7..51ec858344 100644 --- a/engines/lab/detection.cpp +++ b/engines/lab/detection.cpp @@ -123,7 +123,7 @@ public: } virtual const char *getName() const { - return "Lab"; + return "Labyrinth of Time"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp index 1610eb0e2d..d3161b9f85 100644 --- a/engines/lastexpress/detection.cpp +++ b/engines/lastexpress/detection.cpp @@ -232,11 +232,11 @@ public: } const char *getName() const { - return "Lastexpress"; + return "The Last Express"; } const char *getOriginalCopyright() const { - return "LastExpress Engine (C) 1997 Smoking Car Productions"; + return "The Last Express (C) 1997 Smoking Car Productions"; } protected: diff --git a/engines/lilliput/detection.cpp b/engines/lilliput/detection.cpp index eb65ad2d64..eef513eb9e 100644 --- a/engines/lilliput/detection.cpp +++ b/engines/lilliput/detection.cpp @@ -131,7 +131,7 @@ public: } const char *getOriginalCopyright() const { - return "Lilliput Engine copyright S.L.Grand, Brainware, 1991-1992"; + return "Lilliput (C) S.L.Grand, Brainware, 1991-1992"; } bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const; diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index a49ac5f8c9..ae9e2b0cf9 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -216,7 +216,7 @@ public: } virtual const char *getName() const { - return "Lure"; + return "Lure of the Temptress"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp index 8eb3b4eee9..c75c9b9495 100644 --- a/engines/mads/detection.cpp +++ b/engines/mads/detection.cpp @@ -145,11 +145,11 @@ public: } virtual const char *getName() const { - return "MADS Engine"; + return "MADS"; } virtual const char *getOriginalCopyright() const { - return "MADS (C)"; + return "MADS (c) Microprose"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp index 7bc5339179..c4a4841ee2 100644 --- a/engines/mortevielle/detection.cpp +++ b/engines/mortevielle/detection.cpp @@ -61,7 +61,7 @@ public: _flags = kADFlagUseExtraAsHint; } virtual const char *getName() const { - return "Mortevielle"; + return "Mortville Manor"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp index 920d149659..0054301a63 100644 --- a/engines/neverhood/detection.cpp +++ b/engines/neverhood/detection.cpp @@ -203,11 +203,11 @@ public: } virtual const char *getName() const { - return "Neverhood Engine"; + return "The Neverhood Chronicles"; } virtual const char *getOriginalCopyright() const { - return "Neverhood (C) The Neverhood, Inc."; + return "The Neverhood Chronicles (C) The Neverhood, Inc."; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/pink/detection.cpp b/engines/pink/detection.cpp index c6715d17a9..b0d9192f0e 100644 --- a/engines/pink/detection.cpp +++ b/engines/pink/detection.cpp @@ -47,11 +47,11 @@ public: } virtual const char *getName() const { - return "Pink Panther Engine"; + return "Pink Panther"; } virtual const char *getOriginalCopyright() const { - return "Pink Panther Engine (C) Wanderlust Interactive"; + return "Pink Panther (C) Wanderlust Interactive"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/plumbers/detection.cpp b/engines/plumbers/detection.cpp index 38c26ddedd..b890bfcda7 100644 --- a/engines/plumbers/detection.cpp +++ b/engines/plumbers/detection.cpp @@ -77,7 +77,7 @@ public: } virtual const char *getName() const { - return "Plumbers Don't Wear Ties' Engine"; + return "Plumbers Don't Wear Ties"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp index 2147c23116..dd3b2a7cd1 100644 --- a/engines/prince/detection.cpp +++ b/engines/prince/detection.cpp @@ -153,9 +153,9 @@ public: _directoryGlobs = directoryGlobs; } - virtual const char *getName() const { - return "Prince Engine"; - } + virtual const char *getName() const { + return "The Prince and the Coward"; + } virtual const char *getOriginalCopyright() const { return "The Prince and the Coward (C) 1996-97 Metropolis"; diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp index addbcf8d02..ca590b25ee 100644 --- a/engines/queen/detection.cpp +++ b/engines/queen/detection.cpp @@ -499,7 +499,7 @@ public: } virtual const char *getName() const { - return "Queen"; + return "Flight of the Amazon Queen"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 2e5346b59f..38a9fdc1ff 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -566,9 +566,11 @@ public: } virtual const char *getName() const { - return "SCI [SCI0, SCI01, SCI10, SCI11" + return "SCI [" #ifdef ENABLE_SCI32 - ", SCI32" + "all games" +#else + "SCI0, SCI01, SCI10, SCI11" #endif "]"; } diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp index e72700fbf2..ff253a15df 100644 --- a/engines/sherlock/detection.cpp +++ b/engines/sherlock/detection.cpp @@ -137,11 +137,11 @@ public: sherlockGames, optionsList) {} virtual const char *getName() const { - return "Sherlock Engine"; + return "Sherlock"; } virtual const char *getOriginalCopyright() const { - return "Sherlock Engine (C) 1992-1996 Mythos Software, 1992-1996 (C) Electronic Arts"; + return "Sherlock (C) 1992-1996 Mythos Software, (C) 1992-1996 Electronic Arts"; } /** diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index 642e4d31a7..0febe9ec5a 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -89,7 +89,7 @@ public: }; const char *SkyMetaEngine::getName() const { - return "Sky"; + return "Beneath a Steel Sky"; } const char *SkyMetaEngine::getOriginalCopyright() const { diff --git a/engines/sludge/detection.cpp b/engines/sludge/detection.cpp index 8c5c0ac13d..020410d225 100644 --- a/engines/sludge/detection.cpp +++ b/engines/sludge/detection.cpp @@ -84,11 +84,11 @@ public: } virtual const char *getName() const { - return "Sludge Engine"; + return "Sludge"; } virtual const char *getOriginalCopyright() const { - return "Copyright (C) 2000-2014 Hungry Software and contributors"; + return "Sludge (C) 2000-2014 Hungry Software and contributors"; } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp index 90b47158d0..722e1d58b8 100644 --- a/engines/startrek/detection.cpp +++ b/engines/startrek/detection.cpp @@ -311,7 +311,7 @@ public: } virtual const char *getName() const { - return "Star Trek Engine"; + return "Star Trek"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp index b172b7fa49..974dfa6ca1 100644 --- a/engines/supernova/detection.cpp +++ b/engines/supernova/detection.cpp @@ -88,7 +88,7 @@ public: } virtual const char *getName() const { - return "Supernova Engine"; + return "Mission Supernova"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp index 52394cec41..2e52588475 100644 --- a/engines/sword1/detection.cpp +++ b/engines/sword1/detection.cpp @@ -80,10 +80,10 @@ static const char *const g_filesToCheck[NUM_FILES_TO_CHECK] = { // these files h class SwordMetaEngine : public MetaEngine { public: virtual const char *getName() const { - return "Sword1"; + return "Broken Sword: The Shadow of the Templars"; } virtual const char *getOriginalCopyright() const { - return "Broken Sword Games (C) Revolution"; + return "Broken Sword: The Shadow of the Templars (C) Revolution"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 4d8399e630..453efb4894 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -85,10 +85,10 @@ static const ExtraGuiOption sword2ExtraGuiOption = { class Sword2MetaEngine : public MetaEngine { public: virtual const char *getName() const { - return "Sword2"; + return "Broken Sword II: The Smoking Mirror"; } virtual const char *getOriginalCopyright() const { - return "Broken Sword Games (C) Revolution"; + return "Broken Sword II: The Smoking Mirror (C) Revolution"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp index c5f55b5a26..2c91961242 100644 --- a/engines/sword25/detection.cpp +++ b/engines/sword25/detection.cpp @@ -57,7 +57,7 @@ public: _directoryGlobs = directoryGlobs; } virtual const char *getName() const { - return "Sword25"; + return "Broken Sword 2.5"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp index c98fbbdade..ecb90c96f6 100644 --- a/engines/titanic/detection.cpp +++ b/engines/titanic/detection.cpp @@ -63,11 +63,11 @@ public: } virtual const char *getName() const { - return "Titanic Engine"; + return "Starship Titanic"; } virtual const char *getOriginalCopyright() const { - return "Titanic Engine (c) The Digital Village"; + return "Starship Titanic (C) The Digital Village"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp index 0cd9596c8c..778be298cd 100644 --- a/engines/toltecs/detection.cpp +++ b/engines/toltecs/detection.cpp @@ -210,11 +210,11 @@ public: } virtual const char *getName() const { - return "Toltecs Engine"; + return "3 Skulls of the Toltecs"; } virtual const char *getOriginalCopyright() const { - return "Toltecs Engine Revistronic (C) 1996"; + return "3 Skulls of the Toltecs (C) Revistronic 1996"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp index ec0b3e186b..5cc592ad24 100644 --- a/engines/tony/detection.cpp +++ b/engines/tony/detection.cpp @@ -72,11 +72,11 @@ public: } virtual const char *getName() const { - return "Tony Engine"; + return "Tony Tough and the Night of Roasted Moths"; } virtual const char *getOriginalCopyright() const { - return "Tony Engine (C) Protonic Interactive"; + return "Tony Tough and the Night of Roasted Moths (C) Protonic Interactive"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index f3b510b6f4..4be03cc199 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -137,7 +137,7 @@ public: } virtual const char *getName() const { - return "Toon"; + return "Toonstruck"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 51b17b26d9..c9c596eb17 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -138,11 +138,11 @@ public: } virtual const char *getName() const { - return "Touche"; + return "Touche: The Adventures of the Fifth Musketeer"; } virtual const char *getOriginalCopyright() const { - return "Touche: The Adventures of the 5th Musketeer (C) Clipper Software"; + return "Touche: The Adventures of the Fifth Musketeer (C) Clipper Software"; } virtual bool hasFeature(MetaEngineFeature f) const; diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 86f2acd705..5e3cbbf740 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -120,7 +120,7 @@ public: } virtual const char *getName() const { - return "Tucker"; + return "Bud Tucker in Double Trouble"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp index 6452e5741f..4a51b55408 100644 --- a/engines/voyeur/detection.cpp +++ b/engines/voyeur/detection.cpp @@ -71,7 +71,7 @@ public: } virtual const char *getName() const { - return "Voyeur Engine"; + return "Voyeur"; } virtual const char *getOriginalCopyright() const { diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp index d304d95dee..e427396894 100644 --- a/engines/xeen/detection.cpp +++ b/engines/xeen/detection.cpp @@ -114,11 +114,11 @@ public: } virtual const char *getName() const { - return "Xeen Engine"; + return "Xeen"; } virtual const char *getOriginalCopyright() const { - return "Xeen Engine (c) 1992-1993 New World Computing, Inc."; + return "Xeen (c) 1992-1993 New World Computing, Inc."; } virtual bool hasFeature(MetaEngineFeature f) const; -- cgit v1.2.3