ENGINES: Further unify engine names

scummvm · May 22, 2011 · d2a55b4 · d2a55b4
1 parent 041a08b
commit d2a55b4
Show file tree

Hide file tree

Showing 14 changed files with 123 additions and 123 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -49,52 +49,25 @@ ScummVM Team
        Oliver Kiehl          - (retired)
        Ludvig Strigeus       - (retired)
 
-    Beneath a Steel Sky:
-       Robert Goeffringmann  - (retired)
-       Oliver Kiehl          - (retired)
-       Joost Peters
-
-    Broken Sword:
-       Fabio Battaglia       - PSX version support
-       Thierry Crozat        - Mac version support
-       Robert Goeffringmann  - (retired)
-
-    Broken Sword II:
-       Torbjorn Andersson
-       Fabio Battaglia       - PSX version support
-       Jonathan Gray         - (retired)
-
-    Broken Sword 2.5:
-       Eugene Sandulenko
-       Filippos Karapetis
-       Max Horn
-       Paul Gilbert
-       Torbjorn Andersson
-
-    Cinematique evo 1:
+    Cine:
        Vincent Hamm          - (retired)
        Pawel Kolodziejski
        Gregory Montoir
        Kari Salminen
        Eugene Sandulenko
 
-    Cinematique evo 2:
+    CruisE:
        Paul Gilbert
        Vincent Hamm          - (retired)
 
-    Draci Historie:
+    Draci:
        Denis Kasak
        Robert Spalek
 
     Drascula:
        Filippos Karapetis
        Pawel Kolodziejski
 
-    Flight of the Amazon Queen:
-       David Eriksson        - (retired)
-       Gregory Montoir
-       Joost Peters
-
     Gob:
        Torbjorn Andersson
        Arnaud Boutonne
@@ -118,12 +91,12 @@ ScummVM Team
        Gregory Montoir
        Johannes Schickel
 
-    Last Express:
+    Lastexpress:
        Matthew Hoops
        Jordi Vilalta Prat
        Julien Templier
 
-    Lure of the Temptress:
+    Lure:
        Paul Gilbert
 
     M4:
@@ -147,6 +120,11 @@ ScummVM Team
     Parallaction:
        peres
 
+    Queen:
+       David Eriksson        - (retired)
+       Gregory Montoir
+       Joost Peters
+
     SAGA:
        Torbjorn Andersson
        Filippos Karapetis
@@ -164,7 +142,29 @@ ScummVM Team
        Jordi Vilalta Prat
        Lars Skovlund
 
-    Teen Agent:
+    Sky:
+       Robert Goeffringmann  - (retired)
+       Oliver Kiehl          - (retired)
+       Joost Peters
+
+    Sword1:
+       Fabio Battaglia       - PSX version support
+       Thierry Crozat        - Mac version support
+       Robert Goeffringmann  - (retired)
+
+    Sword2:
+       Torbjorn Andersson
+       Fabio Battaglia       - PSX version support
+       Jonathan Gray         - (retired)
+
+    Sword25:
+       Eugene Sandulenko
+       Filippos Karapetis
+       Max Horn
+       Paul Gilbert
+       Torbjorn Andersson
+
+    TeenAgent:
        Robert Megone         - Help with callback rewriting
        Vladimir Menshakov
 

diff --git a/devtools/credits.pl b/devtools/credits.pl
@@ -500,46 +500,20 @@ sub add_paragraph {
 		  add_person("Ludvig Strigeus", "ludde", "(retired)");
 	  end_section();
 
-	  begin_section("Beneath a Steel Sky");
-		  add_person("Robert G&ouml;ffringmann", "lavosspawn", "(retired)");
-		  add_person("Oliver Kiehl", "olki", "(retired)");
-		  add_person("Joost Peters", "joostp", "");
-	  end_section();
-
-	  begin_section("Broken Sword");
-		  add_person("Fabio Battaglia", "Hkz", "PSX version support");
-		  add_person("Thierry Crozat", "criezy", "Mac version support");
-		  add_person("Robert G&ouml;ffringmann", "lavosspawn", "(retired)");
-	  end_section();
-
-	  begin_section("Broken Sword II");
-		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
-		  add_person("Fabio Battaglia", "Hkz", "PSX version support");
-		  add_person("Jonathan Gray", "khalek", "(retired)");
-	  end_section();
-
-	  begin_section("Broken Sword 2.5");
-		  add_person("Eugene Sandulenko", "sev", "");
-		  add_person("Filippos Karapetis", "[md5]", "");
-		  add_person("Max Horn", "Fingolfin", "");
-		  add_person("Paul Gilbert", "dreammaster", "");
-		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
-	  end_section();
-
-	  begin_section("Cinematique evo 1");
+	  begin_section("Cine");
 		  add_person("Vincent Hamm", "yaz0r", "(retired)");
 		  add_person("Pawe&#322; Ko&#322;odziejski", "aquadran", "");
 		  add_person("Gregory Montoir", "cyx", "");
 		  add_person("Kari Salminen", "Buddha^", "");
 		  add_person("Eugene Sandulenko", "sev", "");
 	  end_section();
 
-	  begin_section("Cinematique evo 2");
+	  begin_section("CruisE");
 		  add_person("Paul Gilbert", "dreammaster", "");
 		  add_person("Vincent Hamm", "yaz0r", "(retired)");
 	  end_section();
 
-	  begin_section("Draci Historie");
+	  begin_section("Draci");
 		  add_person("Denis Kasak", "dkasak13", "");
 		  add_person("Robert &Scaron;palek", "spalek", "");
 	  end_section();
@@ -549,12 +523,6 @@ sub add_paragraph {
 		  add_person("Pawe&#322; Ko&#322;odziejski", "aquadran", "");
 	  end_section();
 
-	  begin_section("Flight of the Amazon Queen");
-		  add_person("David Eriksson", "twogood", "(retired)");
-		  add_person("Gregory Montoir", "cyx", "");
-		  add_person("Joost Peters", "joostp", "");
-	  end_section();
-
 	  begin_section("Gob");
 		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
 		  add_person("Arnaud Boutonn&eacute;", "Strangerke", "");
@@ -582,13 +550,13 @@ sub add_paragraph {
 		  add_person("Johannes Schickel", "LordHoto", "");
 	  end_section();
 
-	begin_section("Last Express");
+	begin_section("Lastexpress");
 			add_person("Matthew Hoops", "clone2727", "");
 			add_person("Jordi Vilalta Prat", "jvprat", "");
 			add_person("Julien Templier", "littleboy", "");			
 	end_section();
 
-	  begin_section("Lure of the Temptress");
+	  begin_section("Lure");
 		  add_person("Paul Gilbert", "dreammaster", "");
 	  end_section();
 
@@ -617,6 +585,12 @@ sub add_paragraph {
 		  add_person("", "peres", "");
 	  end_section();
 
+	  begin_section("Queen");
+		  add_person("David Eriksson", "twogood", "(retired)");
+		  add_person("Gregory Montoir", "cyx", "");
+		  add_person("Joost Peters", "joostp", "");
+	  end_section();
+
 	  begin_section("SAGA");
 		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
 		  add_person("Filippos Karapetis", "[md5]", "");
@@ -636,7 +610,33 @@ sub add_paragraph {
 		  add_person("Lars Skovlund", "lskovlun", "");
 	  end_section();
 
-	  begin_section("Teen Agent");
+	  begin_section("Sky");
+		  add_person("Robert G&ouml;ffringmann", "lavosspawn", "(retired)");
+		  add_person("Oliver Kiehl", "olki", "(retired)");
+		  add_person("Joost Peters", "joostp", "");
+	  end_section();
+
+	  begin_section("Sword1");
+		  add_person("Fabio Battaglia", "Hkz", "PSX version support");
+		  add_person("Thierry Crozat", "criezy", "Mac version support");
+		  add_person("Robert G&ouml;ffringmann", "lavosspawn", "(retired)");
+	  end_section();
+
+	  begin_section("Sword2");
+		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
+		  add_person("Fabio Battaglia", "Hkz", "PSX version support");
+		  add_person("Jonathan Gray", "khalek", "(retired)");
+	  end_section();
+
+	  begin_section("Sword25");
+		  add_person("Eugene Sandulenko", "sev", "");
+		  add_person("Filippos Karapetis", "[md5]", "");
+		  add_person("Max Horn", "Fingolfin", "");
+		  add_person("Paul Gilbert", "dreammaster", "");
+		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
+	  end_section();
+
+	  begin_section("TeenAgent");
 		  add_person("Robert Megone", "sanguine", "Help with callback rewriting");
 		  add_person("Vladimir Menshakov", "whoozle", "");
 	  end_section();

diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
@@ -90,7 +90,7 @@ class CineMetaEngine : public AdvancedMetaEngine {
 	CineMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
-		return "Cinematique evo 1";
+		return "Cine";
 	}
 
 	virtual const char *getOriginalCopyright() const {

diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
@@ -247,7 +247,7 @@ class CruiseMetaEngine : public AdvancedMetaEngine {
 	CruiseMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
-		return "Cinematique evo 2";
+		return "CruisE";
 	}
 
 	virtual const char *getOriginalCopyright() const {

diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp
@@ -113,7 +113,7 @@ class DraciMetaEngine : public AdvancedMetaEngine {
 	DraciMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
-		return "Draci Historie";
+		return "Draci";
 	}
 
 	virtual const char *getOriginalCopyright() const {

diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp
@@ -207,7 +207,7 @@ class LastExpressMetaEngine : public AdvancedMetaEngine {
 	LastExpressMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	const char *getName() const {
-		return "Last Express";
+		return "Lastexpress";
 	}
 
 	const char *getOriginalCopyright() const {

diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
@@ -205,7 +205,7 @@ class LureMetaEngine : public AdvancedMetaEngine {
 	LureMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
-		return "Lure of the Temptress";
+		return "Lure";
 	}
 
 	virtual const char *getOriginalCopyright() const {

diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
@@ -69,7 +69,7 @@ class QueenMetaEngine : public MetaEngine {
 };
 
 const char *QueenMetaEngine::getName() const {
-	return "Flight of the Amazon Queen";
+	return "Queen";
 }
 
 const char *QueenMetaEngine::getOriginalCopyright() const {

diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
@@ -79,7 +79,7 @@ class SkyMetaEngine : public MetaEngine {
 };
 
 const char *SkyMetaEngine::getName() const {
-	return "Beneath a Steel Sky";
+	return "Sky";
 }
 
 const char *SkyMetaEngine::getOriginalCopyright() const {

diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
@@ -79,7 +79,7 @@ static const char *g_filesToCheck[NUM_FILES_TO_CHECK] = { // these files have to
 class SwordMetaEngine : public MetaEngine {
 public:
 	virtual const char *getName() const {
-		return "Broken Sword";
+		return "Sword1";
 	}
 	virtual const char *getOriginalCopyright() const {
 		return "Broken Sword Games (C) Revolution";

diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
@@ -76,7 +76,7 @@ static const GameSettings sword2_settings[] = {
 class Sword2MetaEngine : public MetaEngine {
 public:
 	virtual const char *getName() const {
-		return "Broken Sword II";
+		return "Sword2";
 	}
 	virtual const char *getOriginalCopyright() const {
 		return "Broken Sword Games (C) Revolution";

diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp
@@ -102,7 +102,7 @@ class Sword25MetaEngine : public AdvancedMetaEngine {
 	Sword25MetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
-		return "Broken Sword 2.5";
+		return "Sword25";
 	}
 
 	virtual const char *getOriginalCopyright() const {

diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp
@@ -113,7 +113,7 @@ class TeenAgentMetaEngine : public AdvancedMetaEngine {
 	}
 
 	virtual const char *getName() const {
-		return "Teen Agent";
+		return "TeenAgent";
 	}
 
 	virtual const char *getOriginalCopyright() const {