Skip to content

Commit 9a4c0ae

Browse files
committed
ENGINES: Normalize the getName() result of metaengines
Also-By: Matthew Hoops <clone2727@gmail.com>
1 parent cf82dfa commit 9a4c0ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+67
-65
lines changed

engines/access/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class AccessMetaEngine : public AdvancedMetaEngine {
9090
}
9191

9292
virtual const char *getName() const {
93-
return "Access Engine";
93+
return "Access";
9494
}
9595

9696
virtual const char *getOriginalCopyright() const {

engines/avalanche/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class AvalancheMetaEngine : public AdvancedMetaEngine {
8383
}
8484

8585
const char *getOriginalCopyright() const {
86-
return "Avalanche Engine Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.";
86+
return "Avalanche (C) 1994-1995 Mike, Mark and Thomas Thurman.";
8787
}
8888

8989
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;

engines/bladerunner/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ BladeRunnerMetaEngine::BladeRunnerMetaEngine()
6363

6464

6565
const char *BladeRunnerMetaEngine::getName() const {
66-
return "Blade Runner Engine";
66+
return "Blade Runner";
6767
}
6868

6969
const char *BladeRunnerMetaEngine::getOriginalCopyright() const {

engines/chewy/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ class ChewyMetaEngine : public AdvancedMetaEngine {
119119
}
120120

121121
virtual const char *getName() const {
122-
return "Chewy Engine";
122+
return "Chewy: Esc from F5";
123123
}
124124

125125
virtual const char *getOriginalCopyright() const {
126-
return "Chewy Engine New Generation Software (C) 1995";
126+
return "Chewy: Esc from F5 (C) 1995 New Generation Software";
127127
}
128128

129129
virtual bool hasFeature(MetaEngineFeature f) const;

engines/cine/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ class CineMetaEngine : public AdvancedMetaEngine {
8989
}
9090

9191
virtual const char *getName() const {
92-
return "Cine";
92+
return "Cinematique evo 1";
9393
}
9494

9595
virtual const char *getOriginalCopyright() const {
96-
return "Future Wars & Operation Stealth (C) Delphine Software";
96+
return "Cinematique evo 1 (C) Delphine Software";
9797
}
9898

9999
virtual Common::Error createInstance(OSystem *syst, Engine **engine) const {

engines/composer/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ class ComposerMetaEngine : public AdvancedMetaEngine {
486486
}
487487

488488
virtual const char *getName() const {
489-
return "Magic Composer Engine";
489+
return "Magic Composer";
490490
}
491491

492492
virtual const char *getOriginalCopyright() const {

engines/cruise/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@ class CruiseMetaEngine : public AdvancedMetaEngine {
201201
}
202202

203203
virtual const char *getName() const {
204-
return "CruisE";
204+
return "Cinematique evo 2";
205205
}
206206

207207
virtual const char *getOriginalCopyright() const {
208-
return "Cruise for a Corpse (C) Delphine Software";
208+
return "Cinematique evo 2 (C) Delphine Software";
209209
}
210210

211211
virtual bool hasFeature(MetaEngineFeature f) const;

engines/cryo/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ class CryoMetaEngine : public AdvancedMetaEngine {
137137
}
138138

139139
virtual const char *getName() const {
140-
return "Cryo Engine";
140+
return "Cryo";
141141
}
142142

143143
virtual const char *getOriginalCopyright() const {
144-
return "Cryo Engine (C) Cryo Interactive";
144+
return "Cryo (C) Cryo Interactive";
145145
}
146146

147147
virtual bool hasFeature(MetaEngineFeature f) const;

engines/draci/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ class DraciMetaEngine : public AdvancedMetaEngine {
8888
}
8989

9090
virtual const char *getName() const {
91-
return "Draci";
91+
return "Draci Historie";
9292
}
9393

9494
virtual const char *getOriginalCopyright() const {
95-
return "Copyright (C) 1995 NoSense";
95+
return "Draci Historie (C) 1995 NoSense";
9696
}
9797

9898
virtual bool hasFeature(MetaEngineFeature f) const;

engines/drascula/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,11 @@ class DrasculaMetaEngine : public AdvancedMetaEngine {
344344
}
345345

346346
virtual const char *getName() const {
347-
return "Drascula";
347+
return "Drascula: The Vampire Strikes Back";
348348
}
349349

350350
virtual const char *getOriginalCopyright() const {
351-
return "Drascula Engine (C) 2000 Alcachofa Soft, (C) 1996 Digital Dreams Multimedia, (C) 1994 Emilio de Paz";
351+
return "Drascula: The Vampire Strikes Back (C) 2000 Alcachofa Soft, (C) 1996 Digital Dreams Multimedia, (C) 1994 Emilio de Paz";
352352
}
353353

354354
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;

engines/dreamweb/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class DreamWebMetaEngine : public AdvancedMetaEngine {
7676
}
7777

7878
virtual const char *getName() const {
79-
return "DreamWeb engine";
79+
return "DreamWeb";
8080
}
8181

8282
virtual const char *getOriginalCopyright() const {

engines/fullpipe/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ class FullpipeMetaEngine : public AdvancedMetaEngine {
134134
}
135135

136136
virtual const char *getName() const {
137-
return "Fullpipe Engine";
137+
return "Full Pipe";
138138
}
139139

140140
virtual const char *getOriginalCopyright() const {
141-
return "Fullpipe Engine (C) Pipe Studio";
141+
return "Full Pipe (C) Pipe Studio";
142142
}
143143

144144
virtual bool hasFeature(MetaEngineFeature f) const;

engines/hopkins/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ class HopkinsMetaEngine : public AdvancedMetaEngine {
107107
}
108108

109109
virtual const char *getName() const {
110-
return "Hopkins Engine";
110+
return "Hopkins FBI";
111111
}
112112

113113
virtual const char *getOriginalCopyright() const {
114-
return "Hopkins FBI (C)1997-2003 MP Entertainment";
114+
return "Hopkins FBI (c) 1997-2003 MP Entertainment";
115115
}
116116

117117
virtual bool hasFeature(MetaEngineFeature f) const;

engines/lab/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class LabMetaEngine : public AdvancedMetaEngine {
123123
}
124124

125125
virtual const char *getName() const {
126-
return "Lab";
126+
return "Labyrinth of Time";
127127
}
128128

129129
virtual const char *getOriginalCopyright() const {

engines/lastexpress/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ class LastExpressMetaEngine : public AdvancedMetaEngine {
232232
}
233233

234234
const char *getName() const {
235-
return "Lastexpress";
235+
return "The Last Express";
236236
}
237237

238238
const char *getOriginalCopyright() const {
239-
return "LastExpress Engine (C) 1997 Smoking Car Productions";
239+
return "The Last Express (C) 1997 Smoking Car Productions";
240240
}
241241

242242
protected:

engines/lilliput/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class LilliputMetaEngine : public AdvancedMetaEngine {
131131
}
132132

133133
const char *getOriginalCopyright() const {
134-
return "Lilliput Engine copyright S.L.Grand, Brainware, 1991-1992";
134+
return "Lilliput (C) S.L.Grand, Brainware, 1991-1992";
135135
}
136136

137137
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;

engines/lure/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class LureMetaEngine : public AdvancedMetaEngine {
216216
}
217217

218218
virtual const char *getName() const {
219-
return "Lure";
219+
return "Lure of the Temptress";
220220
}
221221

222222
virtual const char *getOriginalCopyright() const {

engines/mads/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ class MADSMetaEngine : public AdvancedMetaEngine {
145145
}
146146

147147
virtual const char *getName() const {
148-
return "MADS Engine";
148+
return "MADS";
149149
}
150150

151151
virtual const char *getOriginalCopyright() const {
152-
return "MADS (C)";
152+
return "MADS (c) Microprose";
153153
}
154154

155155
virtual bool hasFeature(MetaEngineFeature f) const;

engines/mortevielle/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class MortevielleMetaEngine : public AdvancedMetaEngine {
6161
_flags = kADFlagUseExtraAsHint;
6262
}
6363
virtual const char *getName() const {
64-
return "Mortevielle";
64+
return "Mortville Manor";
6565
}
6666

6767
virtual const char *getOriginalCopyright() const {

engines/neverhood/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,11 @@ class NeverhoodMetaEngine : public AdvancedMetaEngine {
203203
}
204204

205205
virtual const char *getName() const {
206-
return "Neverhood Engine";
206+
return "The Neverhood Chronicles";
207207
}
208208

209209
virtual const char *getOriginalCopyright() const {
210-
return "Neverhood (C) The Neverhood, Inc.";
210+
return "The Neverhood Chronicles (C) The Neverhood, Inc.";
211211
}
212212

213213
virtual bool hasFeature(MetaEngineFeature f) const;

engines/pink/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ class PinkMetaEngine : public AdvancedMetaEngine {
4747
}
4848

4949
virtual const char *getName() const {
50-
return "Pink Panther Engine";
50+
return "Pink Panther";
5151
}
5252

5353
virtual const char *getOriginalCopyright() const {
54-
return "Pink Panther Engine (C) Wanderlust Interactive";
54+
return "Pink Panther (C) Wanderlust Interactive";
5555
}
5656

5757
virtual bool hasFeature(MetaEngineFeature f) const;

engines/plumbers/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class PlumbersMetaEngine : public AdvancedMetaEngine {
7777
}
7878

7979
virtual const char *getName() const {
80-
return "Plumbers Don't Wear Ties' Engine";
80+
return "Plumbers Don't Wear Ties";
8181
}
8282

8383
virtual const char *getOriginalCopyright() const {

engines/prince/detection.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ class PrinceMetaEngine : public AdvancedMetaEngine {
153153
_directoryGlobs = directoryGlobs;
154154
}
155155

156-
virtual const char *getName() const {
157-
return "Prince Engine";
158-
}
156+
virtual const char *getName() const {
157+
return "The Prince and the Coward";
158+
}
159159

160160
virtual const char *getOriginalCopyright() const {
161161
return "The Prince and the Coward (C) 1996-97 Metropolis";

engines/queen/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ class QueenMetaEngine : public AdvancedMetaEngine {
499499
}
500500

501501
virtual const char *getName() const {
502-
return "Queen";
502+
return "Flight of the Amazon Queen";
503503
}
504504

505505
virtual const char *getOriginalCopyright() const {

engines/sci/detection.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,11 @@ class SciMetaEngine : public AdvancedMetaEngine {
566566
}
567567

568568
virtual const char *getName() const {
569-
return "SCI [SCI0, SCI01, SCI10, SCI11"
569+
return "SCI ["
570570
#ifdef ENABLE_SCI32
571-
", SCI32"
571+
"all games"
572+
#else
573+
"SCI0, SCI01, SCI10, SCI11"
572574
#endif
573575
"]";
574576
}

engines/sherlock/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ class SherlockMetaEngine : public AdvancedMetaEngine {
137137
sherlockGames, optionsList) {}
138138

139139
virtual const char *getName() const {
140-
return "Sherlock Engine";
140+
return "Sherlock";
141141
}
142142

143143
virtual const char *getOriginalCopyright() const {
144-
return "Sherlock Engine (C) 1992-1996 Mythos Software, 1992-1996 (C) Electronic Arts";
144+
return "Sherlock (C) 1992-1996 Mythos Software, (C) 1992-1996 Electronic Arts";
145145
}
146146

147147
/**

engines/sky/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class SkyMetaEngine : public MetaEngine {
8989
};
9090

9191
const char *SkyMetaEngine::getName() const {
92-
return "Sky";
92+
return "Beneath a Steel Sky";
9393
}
9494

9595
const char *SkyMetaEngine::getOriginalCopyright() const {

engines/sludge/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ class SludgeMetaEngine : public AdvancedMetaEngine {
8484
}
8585

8686
virtual const char *getName() const {
87-
return "Sludge Engine";
87+
return "Sludge";
8888
}
8989

9090
virtual const char *getOriginalCopyright() const {
91-
return "Copyright (C) 2000-2014 Hungry Software and contributors";
91+
return "Sludge (C) 2000-2014 Hungry Software and contributors";
9292
}
9393

9494
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {

engines/startrek/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ class StarTrekMetaEngine : public AdvancedMetaEngine {
311311
}
312312

313313
virtual const char *getName() const {
314-
return "Star Trek Engine";
314+
return "Star Trek";
315315
}
316316

317317
virtual const char *getOriginalCopyright() const {

engines/supernova/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class SupernovaMetaEngine: public AdvancedMetaEngine {
8888
}
8989

9090
virtual const char *getName() const {
91-
return "Supernova Engine";
91+
return "Mission Supernova";
9292
}
9393

9494
virtual const char *getOriginalCopyright() const {

engines/sword1/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ static const char *const g_filesToCheck[NUM_FILES_TO_CHECK] = { // these files h
8080
class SwordMetaEngine : public MetaEngine {
8181
public:
8282
virtual const char *getName() const {
83-
return "Sword1";
83+
return "Broken Sword: The Shadow of the Templars";
8484
}
8585
virtual const char *getOriginalCopyright() const {
86-
return "Broken Sword Games (C) Revolution";
86+
return "Broken Sword: The Shadow of the Templars (C) Revolution";
8787
}
8888

8989
virtual bool hasFeature(MetaEngineFeature f) const;

engines/sword2/sword2.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ static const ExtraGuiOption sword2ExtraGuiOption = {
8585
class Sword2MetaEngine : public MetaEngine {
8686
public:
8787
virtual const char *getName() const {
88-
return "Sword2";
88+
return "Broken Sword II: The Smoking Mirror";
8989
}
9090
virtual const char *getOriginalCopyright() const {
91-
return "Broken Sword Games (C) Revolution";
91+
return "Broken Sword II: The Smoking Mirror (C) Revolution";
9292
}
9393

9494
virtual bool hasFeature(MetaEngineFeature f) const;

engines/sword25/detection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Sword25MetaEngine : public AdvancedMetaEngine {
5757
_directoryGlobs = directoryGlobs;
5858
}
5959
virtual const char *getName() const {
60-
return "Sword25";
60+
return "Broken Sword 2.5";
6161
}
6262

6363
virtual const char *getOriginalCopyright() const {

engines/titanic/detection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ class TitanicMetaEngine : public AdvancedMetaEngine {
6363
}
6464

6565
virtual const char *getName() const {
66-
return "Titanic Engine";
66+
return "Starship Titanic";
6767
}
6868

6969
virtual const char *getOriginalCopyright() const {
70-
return "Titanic Engine (c) The Digital Village";
70+
return "Starship Titanic (C) The Digital Village";
7171
}
7272

7373
virtual bool hasFeature(MetaEngineFeature f) const;

0 commit comments

Comments
 (0)