aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Russo2015-05-16 19:24:31 +0100
committerDavid Russo2015-07-07 15:24:25 +0100
commitfd8ac7ea79441b5c4a85234e2e875444d47f3f79 (patch)
tree85328bf23a1aee848556303c1372db4d61ec5c33
parent0c09973a7058a38d09a1fb526124e905a72dec3f (diff)
downloadscummvm-rg350-fd8ac7ea79441b5c4a85234e2e875444d47f3f79.tar.gz
scummvm-rg350-fd8ac7ea79441b5c4a85234e2e875444d47f3f79.tar.bz2
scummvm-rg350-fd8ac7ea79441b5c4a85234e2e875444d47f3f79.zip
ZVISION: Change mentions of ZVision to Z-Vision
To match official documentation (e.g. game manual, credits).
-rw-r--r--AUTHORS4
-rw-r--r--README2
-rwxr-xr-xdevtools/credits.pl4
-rw-r--r--engines/zvision/configure.engine2
-rw-r--r--engines/zvision/core/console.cpp2
-rw-r--r--engines/zvision/detection.cpp6
-rw-r--r--engines/zvision/file/save_manager.cpp2
-rw-r--r--engines/zvision/graphics/render_manager.cpp2
-rw-r--r--gui/credits.h4
9 files changed, 14 insertions, 14 deletions
diff --git a/AUTHORS b/AUTHORS
index 370f4e9401..bf0b3e3df2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -259,7 +259,7 @@ ScummVM Team
Einar Johan T. Somaaen
Tobia Tesan
- ZVision:
+ Z-Vision:
Adrian Astley
Filippos Karapetis
Anton Yarcev
@@ -670,7 +670,7 @@ Special thanks to
Jimmi Thogersen - For ScummRev, and much obscure code/documentation
Tristan - For additional work on the original MT-32 emulator
James Woodcock - Soundtrack enhancements
- Anton Yartsev - For the original re-implementation of the ZVision
+ Anton Yartsev - For the original re-implementation of the Z-Vision
engine
Tony Warriner and everyone at Revolution Software Ltd. for sharing with us
diff --git a/README b/README
index 7116536222..2a1d7c390e 100644
--- a/README
+++ b/README
@@ -373,7 +373,7 @@ SCI Games by Sierra Entertainment:
Wintermute Games:
Chivalry is Not Dead [chivalry]
-ZVISION Games by Activision:
+Z-Vision Games by Activision:
Zork Nemesis: The Forbidden Lands [znemesis]
Zork: Grand Inquisitor [zgi]
diff --git a/devtools/credits.pl b/devtools/credits.pl
index f82d0d4212..2360576e88 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -789,7 +789,7 @@ begin_credits("Credits");
add_person("Tobia Tesan", "t0by", "");
end_section();
- begin_section("ZVision");
+ begin_section("Z-Vision");
add_person("Adrian Astley", "RichieSams", "");
add_person("Filippos Karapetis", "[md5]", "");
add_person("Anton Yarcev", "Zidane", "");
@@ -1224,7 +1224,7 @@ begin_credits("Credits");
add_person("Jimmi Thøgersen", "", "For ScummRev, and much obscure code/documentation");
add_person("", "Tristan", "For additional work on the original MT-32 emulator");
add_person("James Woodcock", "", "Soundtrack enhancements");
- add_person("Anton Yartsev", "Zidane", "For the original re-implementation of the ZVision engine");
+ add_person("Anton Yartsev", "Zidane", "For the original re-implementation of the Z-Vision engine");
end_persons();
add_paragraph(
diff --git a/engines/zvision/configure.engine b/engines/zvision/configure.engine
index 38a5959995..226870c3fd 100644
--- a/engines/zvision/configure.engine
+++ b/engines/zvision/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine zvision "ZVision" yes "" "" "freetype2 16bit"
+add_engine zvision "Z-Vision" yes "" "" "freetype2 16bit"
diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index f5cacb582c..336541d82a 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -275,7 +275,7 @@ bool Console::cmdDumpFiles(int argc, const char **argv) {
bool Console::cmdDumpImage(int argc, const char **argv) {
if (argc != 2) {
- debugPrintf("Use %s <TGA/TGZ name> to dump a ZVision TGA/TGZ image into a regular BMP image\n", argv[0]);
+ debugPrintf("Use %s <TGA/TGZ name> to dump a Z-Vision TGA/TGZ image into a regular BMP image\n", argv[0]);
return true;
}
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index c817cbf3e9..9e7f21c5ba 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -47,7 +47,7 @@ Common::Language ZVision::getLanguage() const {
} // End of namespace ZVision
static const PlainGameDescriptor zVisionGames[] = {
- {"zvision", "ZVision Game"},
+ {"zvision", "Z-Vision Game"},
{"znemesis", "Zork Nemesis: The Forbidden Lands"},
{"zgi", "Zork: Grand Inquisitor"},
{0, 0}
@@ -302,11 +302,11 @@ public:
}
virtual const char *getName() const {
- return "ZVision";
+ return "Z-Vision";
}
virtual const char *getOriginalCopyright() const {
- return "ZVision Activision (C) 1996";
+ return "Z-Vision (C) 1996 Activision";
}
virtual bool hasFeature(MetaEngineFeature f) const;
diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 63b54269de..d169679e28 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -205,7 +205,7 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
return true;
}
if (tag != SAVEGAME_ID) {
- warning("File is not a ZVision save file. Aborting load");
+ warning("File is not a Z-Vision save file. Aborting load");
return false;
}
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index ce0a02a1ad..f978ef7844 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -196,7 +196,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
uint32 imageHeight;
Image::TGADecoder tga;
uint16 *buffer;
- // All ZVision images are in RGB 555
+ // All Z-Vision images are in RGB 555
destination.format = _engine->_resourcePixelFormat;
bool isTGZ;
diff --git a/gui/credits.h b/gui/credits.h
index 12e75b01fc..5b1607a3e5 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -322,7 +322,7 @@ static const char *credits[] = {
"C0""Einar Johan T. S\370m\345en",
"C0""Tobia Tesan",
"",
-"C1""ZVision",
+"C1""Z-Vision",
"C0""Adrian Astley",
"C0""Filippos Karapetis",
"C0""Anton Yarcev",
@@ -846,7 +846,7 @@ static const char *credits[] = {
"C0""James Woodcock",
"C2""Soundtrack enhancements",
"C0""Anton Yartsev",
-"C2""For the original re-implementation of the ZVision engine",
+"C2""For the original re-implementation of the Z-Vision engine",
"C0""Tony Warriner and everyone at Revolution Software Ltd. for sharing with us the source of some of their brilliant games, allowing us to release Beneath a Steel Sky as freeware... and generally being supportive above and beyond the call of duty.",
"C0""",
"C0""John Passfield and Steve Stamatiadis for sharing the source of their classic title, Flight of the Amazon Queen and also being incredibly supportive.",