diff options
author | Max Horn | 2010-01-03 21:20:05 +0000 |
---|---|---|
committer | Max Horn | 2010-01-03 21:20:05 +0000 |
commit | df81b68967d379c527b60c4bca2203a88c4be5d9 (patch) | |
tree | 3ad20ee0a511ec37e96679bc80a5867634c6edd9 /engines/sword2 | |
parent | d13b23d688c51849509de267fa469af7334a94f9 (diff) | |
download | scummvm-rg350-df81b68967d379c527b60c4bca2203a88c4be5d9.tar.gz scummvm-rg350-df81b68967d379c527b60c4bca2203a88c4be5d9.tar.bz2 scummvm-rg350-df81b68967d379c527b60c4bca2203a88c4be5d9.zip |
Change BS 1 & 2 to I & II (see discussion on -devel)
svn-id: r46951
Diffstat (limited to 'engines/sword2')
-rw-r--r-- | engines/sword2/memory.cpp | 2 | ||||
-rw-r--r-- | engines/sword2/protocol.cpp | 4 | ||||
-rw-r--r-- | engines/sword2/resman.cpp | 14 | ||||
-rw-r--r-- | engines/sword2/sword2.cpp | 14 |
4 files changed, 17 insertions, 17 deletions
diff --git a/engines/sword2/memory.cpp b/engines/sword2/memory.cpp index 5ca484343c..cd36f9a19b 100644 --- a/engines/sword2/memory.cpp +++ b/engines/sword2/memory.cpp @@ -31,7 +31,7 @@ // with our PocketPC version. // // There is one thing that prevents us from replacing the whole memory manager -// with the standard memory allocation functions: Broken Sword 2 absolutely, +// with the standard memory allocation functions: Broken Sword II absolutely, // positively needs to be able to encode pointers as 32-bit integers. The // original engine did this simply by casting between pointers and integers, // but as far as I know that's not a very portable thing to do. diff --git a/engines/sword2/protocol.cpp b/engines/sword2/protocol.cpp index bb5f68fd5f..03b021f04c 100644 --- a/engines/sword2/protocol.cpp +++ b/engines/sword2/protocol.cpp @@ -305,7 +305,7 @@ byte *Sword2Engine::fetchPsxBackground(uint32 location) { byte *buffer; if (!file.open("screens.clu")) { - GUIErrorMessage("Broken Sword 2: Cannot open screens.clu"); + GUIErrorMessage("Broken Sword II: Cannot open screens.clu"); return NULL; } @@ -373,7 +373,7 @@ byte *Sword2Engine::fetchPsxParallax(uint32 location, uint8 level) { return NULL; if (!file.open("screens.clu")) { - GUIErrorMessage("Broken Sword 2: Cannot open screens.clu"); + GUIErrorMessage("Broken Sword II: Cannot open screens.clu"); return NULL; } diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp index d8545d9c95..81d74f355b 100644 --- a/engines/sword2/resman.cpp +++ b/engines/sword2/resman.cpp @@ -106,7 +106,7 @@ bool ResourceManager::init() { Common::File file; if (!file.open("resource.inf")) { - GUIErrorMessage("Broken Sword 2: Cannot open resource.inf"); + GUIErrorMessage("Broken Sword II: Cannot open resource.inf"); return false; } @@ -127,7 +127,7 @@ bool ResourceManager::init() { _resFiles[_totalClusters].numEntries = -1; _resFiles[_totalClusters].entryTab = NULL; if (++_totalClusters >= MAX_res_files) { - GUIErrorMessage("Broken Sword 2: Too many entries in resource.inf"); + GUIErrorMessage("Broken Sword II: Too many entries in resource.inf"); return false; } } @@ -136,7 +136,7 @@ bool ResourceManager::init() { // Now load in the binary id to res conversion table if (!file.open("resource.tab")) { - GUIErrorMessage("Broken Sword 2: Cannot open resource.tab"); + GUIErrorMessage("Broken Sword II: Cannot open resource.tab"); return false; } @@ -153,7 +153,7 @@ bool ResourceManager::init() { if (file.eos() || file.err()) { file.close(); - GUIErrorMessage("Broken Sword 2: Cannot read resource.tab"); + GUIErrorMessage("Broken Sword II: Cannot read resource.tab"); return false; } @@ -163,7 +163,7 @@ bool ResourceManager::init() { // version, which has all files on one disc. if (!file.open("cd.inf") && !Sword2Engine::isPsx()) { - GUIErrorMessage("Broken Sword 2: Cannot open cd.inf"); + GUIErrorMessage("Broken Sword II: Cannot open cd.inf"); return false; } @@ -181,7 +181,7 @@ bool ResourceManager::init() { if (file.eos() || file.err()) { delete[] cdInf; file.close(); - GUIErrorMessage("Broken Sword 2: Cannot read cd.inf"); + GUIErrorMessage("Broken Sword II: Cannot read cd.inf"); return false; } @@ -209,7 +209,7 @@ bool ResourceManager::init() { // the resource manager will print a fatal error. if (cdInf[i].cd == 0 && !Common::File::exists((char *)cdInf[i].clusterName)) { - GUIErrorMessage("Broken Sword 2: Cannot find " + Common::String((char *)cdInf[i].clusterName)); + GUIErrorMessage("Broken Sword II: Cannot find " + Common::String((char *)cdInf[i].clusterName)); delete[] cdInf; return false; } diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index ec1bb4888c..cf9e67e178 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -66,12 +66,12 @@ struct GameSettings { }; static const GameSettings sword2_settings[] = { - /* Broken Sword 2 */ - {"sword2", "Broken Sword 2: The Smoking Mirror", 0, "players.clu" }, - {"sword2alt", "Broken Sword 2: The Smoking Mirror (alt)", 0, "r2ctlns.ocx" }, - {"sword2psx", "Broken Sword 2: The Smoking Mirror (PlayStation)", 0, "screens.clu"}, - {"sword2psxdemo", "Broken Sword 2: The Smoking Mirror (PlayStation/Demo)", Sword2::GF_DEMO, "screens.clu"}, - {"sword2demo", "Broken Sword 2: The Smoking Mirror (Demo)", Sword2::GF_DEMO, "players.clu" }, + /* Broken Sword II */ + {"sword2", "Broken Sword II: The Smoking Mirror", 0, "players.clu" }, + {"sword2alt", "Broken Sword II: The Smoking Mirror (alt)", 0, "r2ctlns.ocx" }, + {"sword2psx", "Broken Sword II: The Smoking Mirror (PlayStation)", 0, "screens.clu"}, + {"sword2psxdemo", "Broken Sword II: The Smoking Mirror (PlayStation/Demo)", Sword2::GF_DEMO, "screens.clu"}, + {"sword2demo", "Broken Sword II: The Smoking Mirror (Demo)", Sword2::GF_DEMO, "players.clu" }, {NULL, NULL, 0, NULL} }; @@ -80,7 +80,7 @@ static const GameSettings sword2_settings[] = { class Sword2MetaEngine : public MetaEngine { public: virtual const char *getName() const { - return "Broken Sword 2"; + return "Broken Sword II"; } virtual const char *getOriginalCopyright() const { return "Broken Sword Games (C) Revolution"; |