aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-02-12 07:54:14 +0100
committerStrangerke2014-02-12 07:54:14 +0100
commite7cc3fc4df2580870a6547a0c34e9d6b26063178 (patch)
treeca55c287ae46e717e67c4b3d312ee6efabca6283 /engines
parent82b4768dd76a9962d4781be4353467cd85dc44c3 (diff)
downloadscummvm-rg350-e7cc3fc4df2580870a6547a0c34e9d6b26063178.tar.gz
scummvm-rg350-e7cc3fc4df2580870a6547a0c34e9d6b26063178.tar.bz2
scummvm-rg350-e7cc3fc4df2580870a6547a0c34e9d6b26063178.zip
VOYEUR: Use American English instead of British English in several places
Diffstat (limited to 'engines')
-rw-r--r--engines/voyeur/data.cpp2
-rw-r--r--engines/voyeur/files.cpp2
-rw-r--r--engines/voyeur/files.h4
-rw-r--r--engines/voyeur/voyeur.cpp4
-rw-r--r--engines/voyeur/voyeur.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp
index 8e22fe3ad1..db59760e13 100644
--- a/engines/voyeur/data.cpp
+++ b/engines/voyeur/data.cpp
@@ -39,7 +39,7 @@ void VoyeurEvent::synchronize(Common::Serializer &s) {
/*------------------------------------------------------------------------*/
SVoy::SVoy() {
- // Initialise all the data fields of SVoy to empty values
+ // Initialize all the data fields of SVoy to empty values
Common::fill((byte *)this, (byte *)this + sizeof(SVoy), 0);
_eventFlags = EVTFLAG_TIME_DISABLED;
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 1f83eb6622..79e81b0cd1 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -429,7 +429,7 @@ byte *BoltFile::getBoltMember(uint32 id) {
_state._decompState = 0;
_state._historyIndex = 0;
- // Initialise the resource
+ // Initialize the resource
assert(_state._curMemberPtr->_initMethod < 25);
initResource(_state._curMemberPtr->_initMethod);
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index 476014815a..0e5be690f2 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -587,7 +587,7 @@ public:
virtual ~ThreadResource() {}
/**
- * Initialise the thread
+ * Initialize the thread
*/
void initThreadStruct(int idx, int id);
@@ -607,7 +607,7 @@ public:
bool goToState(int stackId, int stateId);
/**
- * Initialises data for the thread based on the current state
+ * Initializes data for the thread based on the current state
*/
bool doState();
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index adec4fbffa..911daa0e2b 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -57,7 +57,7 @@ VoyeurEngine::VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc)
DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
- initialiseManagers();
+ initializeManagers();
}
VoyeurEngine::~VoyeurEngine() {
@@ -91,7 +91,7 @@ int VoyeurEngine::getRandomNumber(int maxNumber) {
return _randomSource.getRandomNumber(maxNumber);
}
-void VoyeurEngine::initialiseManagers() {
+void VoyeurEngine::initializeManagers() {
_debugger.setVm(this);
_eventsManager.setVm(this);
_filesManager.setVm(this);
diff --git a/engines/voyeur/voyeur.h b/engines/voyeur/voyeur.h
index 16c2c400b6..4daa8f5372 100644
--- a/engines/voyeur/voyeur.h
+++ b/engines/voyeur/voyeur.h
@@ -80,7 +80,7 @@ private:
FontInfoResource _defaultFontInfo;
void ESP_Init();
- void initialiseManagers();
+ void initializeManagers();
void globalInitBolt();
void initBolt();
void vInitInterrupts();