diff options
author | Strangerke | 2014-05-19 20:56:03 +0200 |
---|---|---|
committer | Strangerke | 2014-05-19 20:56:03 +0200 |
commit | 6d1fc8256f19e0b320b9b160b198f17af1cd14ff (patch) | |
tree | 9ddb538cf5a59d00c7c274372a33d06528432f5e /engines/mads | |
parent | e016e65767598d5aeb172f3cce8bcb106df25ddc (diff) | |
download | scummvm-rg350-6d1fc8256f19e0b320b9b160b198f17af1cd14ff.tar.gz scummvm-rg350-6d1fc8256f19e0b320b9b160b198f17af1cd14ff.tar.bz2 scummvm-rg350-6d1fc8256f19e0b320b9b160b198f17af1cd14ff.zip |
MADS: Some more British -> American English modifications
Diffstat (limited to 'engines/mads')
-rw-r--r-- | engines/mads/dragonsphere/game_dragonsphere.cpp | 2 | ||||
-rw-r--r-- | engines/mads/dragonsphere/game_dragonsphere.h | 2 | ||||
-rw-r--r-- | engines/mads/game.cpp | 4 | ||||
-rw-r--r-- | engines/mads/game.h | 2 | ||||
-rw-r--r-- | engines/mads/nebular/dialogs_nebular.cpp | 2 | ||||
-rw-r--r-- | engines/mads/nebular/game_nebular.cpp | 2 | ||||
-rw-r--r-- | engines/mads/nebular/game_nebular.h | 2 | ||||
-rw-r--r-- | engines/mads/nebular/sound_nebular.cpp | 2 | ||||
-rw-r--r-- | engines/mads/phantom/game_phantom.cpp | 2 | ||||
-rw-r--r-- | engines/mads/phantom/game_phantom.h | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/engines/mads/dragonsphere/game_dragonsphere.cpp b/engines/mads/dragonsphere/game_dragonsphere.cpp index 49c38460e2..bee5312660 100644 --- a/engines/mads/dragonsphere/game_dragonsphere.cpp +++ b/engines/mads/dragonsphere/game_dragonsphere.cpp @@ -58,7 +58,7 @@ ProtectionResult GameDragonsphere::checkCopyProtection() { return PROTECTION_SUCCEED; } -void GameDragonsphere::initialiseGlobals() { +void GameDragonsphere::initializeGlobals() { //int count, count2; //int bad; diff --git a/engines/mads/dragonsphere/game_dragonsphere.h b/engines/mads/dragonsphere/game_dragonsphere.h index 2bfcde1c63..cd7ac577fc 100644 --- a/engines/mads/dragonsphere/game_dragonsphere.h +++ b/engines/mads/dragonsphere/game_dragonsphere.h @@ -53,7 +53,7 @@ protected: virtual ProtectionResult checkCopyProtection(); - virtual void initialiseGlobals(); + virtual void initializeGlobals(); virtual void setSectionHandler(); diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp index 3c69f452b4..118dc829c3 100644 --- a/engines/mads/game.cpp +++ b/engines/mads/game.cpp @@ -95,7 +95,7 @@ Game::~Game() { } void Game::run() { - initialiseGlobals(); + initializeGlobals(); // If requested, load a savegame instead of showing the intro if (ConfMan.hasKey("save_slot")) { @@ -144,7 +144,7 @@ void Game::run() { } if (protectionResult != 1 && protectionResult != 2) { - initialiseGlobals(); + initializeGlobals(); } if (_statusFlag) diff --git a/engines/mads/game.h b/engines/mads/game.h index d171638b66..a55de617fd 100644 --- a/engines/mads/game.h +++ b/engines/mads/game.h @@ -112,7 +112,7 @@ protected: /** * Initialises global variables for a new game */ - virtual void initialiseGlobals() = 0; + virtual void initializeGlobals() = 0; /** * Set up the section handler specific to each section diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp index df423f92a8..f22ec1ad90 100644 --- a/engines/mads/nebular/dialogs_nebular.cpp +++ b/engines/mads/nebular/dialogs_nebular.cpp @@ -425,7 +425,7 @@ void PictureDialog::save() { frame->getTransparencyIndex()); _vm->_screen.copyRectToScreen(_vm->_screen.getBounds()); - // Adjust the dialog colours to use + // Adjust the dialog colors to use TEXTDIALOG_CONTENT1 -= 10; TEXTDIALOG_CONTENT2 -= 10; TEXTDIALOG_EDGE -= 10; diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp index 1ec025c8e1..8be6068006 100644 --- a/engines/mads/nebular/game_nebular.cpp +++ b/engines/mads/nebular/game_nebular.cpp @@ -59,7 +59,7 @@ ProtectionResult GameNebular::checkCopyProtection() { return PROTECTION_SUCCEED; } -void GameNebular::initialiseGlobals() { +void GameNebular::initializeGlobals() { int count, count2; int bad; diff --git a/engines/mads/nebular/game_nebular.h b/engines/mads/nebular/game_nebular.h index 82ddfb5972..da252219f4 100644 --- a/engines/mads/nebular/game_nebular.h +++ b/engines/mads/nebular/game_nebular.h @@ -103,7 +103,7 @@ protected: virtual ProtectionResult checkCopyProtection(); - virtual void initialiseGlobals(); + virtual void initializeGlobals(); virtual void setSectionHandler(); diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp index 666b686267..b20b0d2b96 100644 --- a/engines/mads/nebular/sound_nebular.cpp +++ b/engines/mads/nebular/sound_nebular.cpp @@ -154,7 +154,7 @@ ASound::ASound(Audio::Mixer *mixer, const Common::String &filename, int dataOffs if (!_soundFile.open(filename)) error("Could not open file - %s", filename.c_str()); - // Initialise fields + // Initialize fields _commandParam = 0; _activeChannelPtr = nullptr; _samplePtr = nullptr; diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp index 5232322c73..bcaec8e648 100644 --- a/engines/mads/phantom/game_phantom.cpp +++ b/engines/mads/phantom/game_phantom.cpp @@ -58,7 +58,7 @@ ProtectionResult GamePhantom::checkCopyProtection() { return PROTECTION_SUCCEED; } -void GamePhantom::initialiseGlobals() { +void GamePhantom::initializeGlobals() { //int count, count2; //int bad; diff --git a/engines/mads/phantom/game_phantom.h b/engines/mads/phantom/game_phantom.h index 96299fb814..3043e538a5 100644 --- a/engines/mads/phantom/game_phantom.h +++ b/engines/mads/phantom/game_phantom.h @@ -52,7 +52,7 @@ protected: virtual ProtectionResult checkCopyProtection(); - virtual void initialiseGlobals(); + virtual void initializeGlobals(); virtual void setSectionHandler(); |