[Scummvm-cvs-logs] scummvm master -> d2a55b42c938ef7a3ae19ff9fd8d6d2d5a727756
criezy
criezy at scummvm.org
Sun May 22 13:51:06 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d2a55b42c9 ENGINES: Further unify engine names
Commit: d2a55b42c938ef7a3ae19ff9fd8d6d2d5a727756
https://github.com/scummvm/scummvm/commit/d2a55b42c938ef7a3ae19ff9fd8d6d2d5a727756
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2011-05-22T04:47:35-07:00
Commit Message:
ENGINES: Further unify engine names
Changed paths:
AUTHORS
devtools/credits.pl
engines/cine/detection.cpp
engines/cruise/detection.cpp
engines/draci/detection.cpp
engines/lastexpress/detection.cpp
engines/lure/detection.cpp
engines/queen/queen.cpp
engines/sky/detection.cpp
engines/sword1/detection.cpp
engines/sword2/sword2.cpp
engines/sword25/detection.cpp
engines/teenagent/detection.cpp
gui/credits.h
diff --git a/AUTHORS b/AUTHORS
index 6bb8545..d299112 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -49,40 +49,18 @@ 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
@@ -90,11 +68,6 @@ ScummVM Team
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
index f515844..0f07641 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -500,33 +500,7 @@ begin_credits("Credits");
add_person("Ludvig Strigeus", "ludde", "(retired)");
end_section();
- begin_section("Beneath a Steel Sky");
- add_person("Robert Gö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öffringmann", "lavosspawn", "(retired)");
- end_section();
-
- begin_section("Broken Sword II");
- add_person("Torbjö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örn Andersson", "eriktorbjorn", "");
- end_section();
-
- begin_section("Cinematique evo 1");
+ begin_section("Cine");
add_person("Vincent Hamm", "yaz0r", "(retired)");
add_person("Paweł Kołodziejski", "aquadran", "");
add_person("Gregory Montoir", "cyx", "");
@@ -534,12 +508,12 @@ begin_credits("Credits");
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 Špalek", "spalek", "");
end_section();
@@ -549,12 +523,6 @@ begin_credits("Credits");
add_person("Paweł Koł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örn Andersson", "eriktorbjorn", "");
add_person("Arnaud Boutonné", "Strangerke", "");
@@ -582,13 +550,13 @@ begin_credits("Credits");
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 @@ begin_credits("Credits");
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örn Andersson", "eriktorbjorn", "");
add_person("Filippos Karapetis", "[md5]", "");
@@ -636,7 +610,33 @@ begin_credits("Credits");
add_person("Lars Skovlund", "lskovlun", "");
end_section();
- begin_section("Teen Agent");
+ begin_section("Sky");
+ add_person("Robert Gö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öffringmann", "lavosspawn", "(retired)");
+ end_section();
+
+ begin_section("Sword2");
+ add_person("Torbjö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ö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
index 262798a..0ef2c87 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -90,7 +90,7 @@ public:
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
index 4aaaf03..3bd0c1f 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -247,7 +247,7 @@ public:
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
index 572ecce..d3483eb 100644
--- a/engines/draci/detection.cpp
+++ b/engines/draci/detection.cpp
@@ -113,7 +113,7 @@ public:
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
index bfcb415..7c7c6b0 100644
--- a/engines/lastexpress/detection.cpp
+++ b/engines/lastexpress/detection.cpp
@@ -207,7 +207,7 @@ public:
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
index a69300e..4d03148 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -205,7 +205,7 @@ public:
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
index 97f757c..3c1826c 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -69,7 +69,7 @@ public:
};
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
index 21921f2..6844d2e 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -79,7 +79,7 @@ public:
};
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
index 9fb6cbb..8ffd96d 100644
--- 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
index 47c9b16..bc34e15 100644
--- 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
index caa1cf5..fd5820d 100644
--- a/engines/sword25/detection.cpp
+++ b/engines/sword25/detection.cpp
@@ -102,7 +102,7 @@ public:
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
index 4784e2f..5012e6a 100644
--- a/engines/teenagent/detection.cpp
+++ b/engines/teenagent/detection.cpp
@@ -113,7 +113,7 @@ public:
}
virtual const char *getName() const {
- return "Teen Agent";
+ return "TeenAgent";
}
virtual const char *getOriginalCopyright() const {
diff --git a/gui/credits.h b/gui/credits.h
index a22c0b0..a98fddd 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -62,36 +62,7 @@ static const char *credits[] = {
"C0""Ludvig Strigeus",
"C2""(retired)",
"",
-"C1""Beneath a Steel Sky",
-"C0""Robert G\366ffringmann",
-"C2""(retired)",
-"C0""Oliver Kiehl",
-"C2""(retired)",
-"C0""Joost Peters",
-"",
-"C1""Broken Sword",
-"C0""Fabio Battaglia",
-"C2""PSX version support",
-"C0""Thierry Crozat",
-"C2""Mac version support",
-"C0""Robert G\366ffringmann",
-"C2""(retired)",
-"",
-"C1""Broken Sword II",
-"C0""Torbj\366rn Andersson",
-"C0""Fabio Battaglia",
-"C2""PSX version support",
-"C0""Jonathan Gray",
-"C2""(retired)",
-"",
-"C1""Broken Sword 2.5",
-"C0""Eugene Sandulenko",
-"C0""Filippos Karapetis",
-"C0""Max Horn",
-"C0""Paul Gilbert",
-"C0""Torbj\366rn Andersson",
-"",
-"C1""Cinematique evo 1",
+"C1""Cine",
"C0""Vincent Hamm",
"C2""(retired)",
"C0""Pawel Kolodziejski",
@@ -99,12 +70,12 @@ static const char *credits[] = {
"C0""Kari Salminen",
"C0""Eugene Sandulenko",
"",
-"C1""Cinematique evo 2",
+"C1""CruisE",
"C0""Paul Gilbert",
"C0""Vincent Hamm",
"C2""(retired)",
"",
-"C1""Draci Historie",
+"C1""Draci",
"C0""Denis Kasak",
"C0""Robert Spalek",
"",
@@ -112,12 +83,6 @@ static const char *credits[] = {
"C0""Filippos Karapetis",
"C0""Pawel Kolodziejski",
"",
-"C1""Flight of the Amazon Queen",
-"C0""David Eriksson",
-"C2""(retired)",
-"C0""Gregory Montoir",
-"C0""Joost Peters",
-"",
"C1""Gob",
"C0""Torbj\366rn Andersson",
"C0""Arnaud Boutonn\351",
@@ -142,12 +107,12 @@ static const char *credits[] = {
"C0""Gregory Montoir",
"C0""Johannes Schickel",
"",
-"C1""Last Express",
+"C1""Lastexpress",
"C0""Matthew Hoops",
"C0""Jordi Vilalta Prat",
"C0""Julien Templier",
"",
-"C1""Lure of the Temptress",
+"C1""Lure",
"C0""Paul Gilbert",
"",
"C1""M4",
@@ -171,6 +136,12 @@ static const char *credits[] = {
"C1""Parallaction",
"C0""peres",
"",
+"C1""Queen",
+"C0""David Eriksson",
+"C2""(retired)",
+"C0""Gregory Montoir",
+"C0""Joost Peters",
+"",
"C1""SAGA",
"C0""Torbj\366rn Andersson",
"C0""Filippos Karapetis",
@@ -188,7 +159,36 @@ static const char *credits[] = {
"C0""Jordi Vilalta Prat",
"C0""Lars Skovlund",
"",
-"C1""Teen Agent",
+"C1""Sky",
+"C0""Robert G\366ffringmann",
+"C2""(retired)",
+"C0""Oliver Kiehl",
+"C2""(retired)",
+"C0""Joost Peters",
+"",
+"C1""Sword1",
+"C0""Fabio Battaglia",
+"C2""PSX version support",
+"C0""Thierry Crozat",
+"C2""Mac version support",
+"C0""Robert G\366ffringmann",
+"C2""(retired)",
+"",
+"C1""Sword2",
+"C0""Torbj\366rn Andersson",
+"C0""Fabio Battaglia",
+"C2""PSX version support",
+"C0""Jonathan Gray",
+"C2""(retired)",
+"",
+"C1""Sword25",
+"C0""Eugene Sandulenko",
+"C0""Filippos Karapetis",
+"C0""Max Horn",
+"C0""Paul Gilbert",
+"C0""Torbj\366rn Andersson",
+"",
+"C1""TeenAgent",
"C0""Robert Megone",
"C2""Help with callback rewriting",
"C0""Vladimir Menshakov",
More information about the Scummvm-git-logs
mailing list