aboutsummaryrefslogtreecommitdiff
path: root/engines/mads
diff options
context:
space:
mode:
authorJohannes Schickel2014-05-27 00:58:25 +0200
committerJohannes Schickel2014-05-27 00:58:25 +0200
commit9099b36caa88d7675a03fb0bd283acf4e1122474 (patch)
tree9eec36c2e46e5e0937847ec4e67de23a3a1d59d5 /engines/mads
parentdb3ca8255fd0f237e2b180a94e3124e0caf00e45 (diff)
downloadscummvm-rg350-9099b36caa88d7675a03fb0bd283acf4e1122474.tar.gz
scummvm-rg350-9099b36caa88d7675a03fb0bd283acf4e1122474.tar.bz2
scummvm-rg350-9099b36caa88d7675a03fb0bd283acf4e1122474.zip
MADS: initialise -> initialize.
Diffstat (limited to 'engines/mads')
-rw-r--r--engines/mads/compression.cpp8
-rw-r--r--engines/mads/compression.h2
-rw-r--r--engines/mads/font.h2
-rw-r--r--engines/mads/game.h4
-rw-r--r--engines/mads/mads.cpp6
-rw-r--r--engines/mads/mads.h2
-rw-r--r--engines/mads/msurface.h2
-rw-r--r--engines/mads/nebular/sound_nebular.cpp2
-rw-r--r--engines/mads/palette.cpp2
-rw-r--r--engines/mads/palette.h4
-rw-r--r--engines/mads/scene.cpp2
-rw-r--r--engines/mads/scene.h2
-rw-r--r--engines/mads/screen.h2
-rw-r--r--engines/mads/sound.h2
14 files changed, 21 insertions, 21 deletions
diff --git a/engines/mads/compression.cpp b/engines/mads/compression.cpp
index 2284f17321..5f78357378 100644
--- a/engines/mads/compression.cpp
+++ b/engines/mads/compression.cpp
@@ -42,16 +42,16 @@ bool MadsPack::isCompressed(Common::SeekableReadStream *stream) {
}
MadsPack::MadsPack(Common::SeekableReadStream *stream) {
- initialise(stream);
+ initialize(stream);
}
MadsPack::MadsPack(const Common::String &resourceName, MADSEngine *vm) {
File file(resourceName);
- initialise(&file);
+ initialize(&file);
file.close();
}
-void MadsPack::initialise(Common::SeekableReadStream *stream) {
+void MadsPack::initialize(Common::SeekableReadStream *stream) {
if (!MadsPack::isCompressed(stream))
error("Attempted to decompress a resource that was not MadsPacked");
@@ -124,7 +124,7 @@ void FabDecompressor::decompress(const byte *srcData, int srcSize, byte *destDat
copyOfs = 0xFFFF0000;
destP = destData;
- // Initialise data fields
+ // Initialize data fields
_srcData = srcData;
_srcP = _srcData + 6;
_srcSize = srcSize;
diff --git a/engines/mads/compression.h b/engines/mads/compression.h
index e6eca420b5..f7381e4af3 100644
--- a/engines/mads/compression.h
+++ b/engines/mads/compression.h
@@ -49,7 +49,7 @@ private:
int _count;
int _dataOffset;
- void initialise(Common::SeekableReadStream *stream);
+ void initialize(Common::SeekableReadStream *stream);
public:
static bool isCompressed(Common::SeekableReadStream *stream);
MadsPack(Common::SeekableReadStream *stream);
diff --git a/engines/mads/font.h b/engines/mads/font.h
index 1d733280df..47df647637 100644
--- a/engines/mads/font.h
+++ b/engines/mads/font.h
@@ -52,7 +52,7 @@ private:
static Common::HashMap<Common::String, Font *> *_fonts;
public:
/**
- * Initialise the font system
+ * Initialize the font system
*/
static void init(MADSEngine *vm);
diff --git a/engines/mads/game.h b/engines/mads/game.h
index a55de617fd..6ec053e068 100644
--- a/engines/mads/game.h
+++ b/engines/mads/game.h
@@ -97,7 +97,7 @@ protected:
Game(MADSEngine *vm);
/**
- * Initialises the current section number of the game
+ * Initializes the current section number of the game
*/
void initSection(int sectionNumber);
@@ -110,7 +110,7 @@ protected:
virtual ProtectionResult checkCopyProtection() = 0;
/**
- * Initialises global variables for a new game
+ * Initializes global variables for a new game
*/
virtual void initializeGlobals() = 0;
diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index bcd8fdba8f..871d1b5033 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -38,7 +38,7 @@ namespace MADS {
MADSEngine::MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc) :
_gameDescription(gameDesc), Engine(syst), _randomSource("MADS") {
- // Initialise fields
+ // Initialize fields
_easyMouse = true;
_invObjectsAnimated = true;
_textWindowStill = false;
@@ -68,7 +68,7 @@ MADSEngine::~MADSEngine() {
delete _sound;
}
-void MADSEngine::initialise() {
+void MADSEngine::initialize() {
// Set up debug channels
DebugMan.addDebugChannel(kDebugPath, "Path", "Pathfinding debug level");
DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
@@ -96,7 +96,7 @@ void MADSEngine::initialise() {
Common::Error MADSEngine::run() {
initGraphics(MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT, false);
- initialise();
+ initialize();
// Run the game
_game->run();
diff --git a/engines/mads/mads.h b/engines/mads/mads.h
index 3f325fd6a1..9a8f2152a1 100644
--- a/engines/mads/mads.h
+++ b/engines/mads/mads.h
@@ -83,7 +83,7 @@ private:
/**
* Handles basic initialisation
*/
- void initialise();
+ void initialize();
protected:
// Engine APIs
virtual Common::Error run();
diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h
index e3cf89d649..8ad0b1cda4 100644
--- a/engines/mads/msurface.h
+++ b/engines/mads/msurface.h
@@ -82,7 +82,7 @@ public:
virtual ~MSurface();
/**
- * Reinitialises a surface to have a given set of dimensions
+ * Reinitializes a surface to have a given set of dimensions
*/
void setSize(int width, int height);
diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index 608a31cb25..577ed26d13 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -197,7 +197,7 @@ ASound::ASound(Audio::Mixer *mixer, const Common::String &filename, int dataOffs
_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1,
Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
- // Initialise the Adlib
+ // Initialize the Adlib
adlibInit();
// Reset the adlib
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index b5a379dfde..755f7bcf5c 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -504,7 +504,7 @@ void Fader::mapToGreyRamp(byte palette[PALETTE_SIZE], int baseColor, int numColo
// Sort the mapping lists
insertionSort(numColors, greyList, greyMapping);
- // Initialise state variables
+ // Initialize state variables
int greySum = 0;
int greyScan = 0;
int greyMark = 0;
diff --git a/engines/mads/palette.h b/engines/mads/palette.h
index 8b40124f4e..ff93b2f2fe 100644
--- a/engines/mads/palette.h
+++ b/engines/mads/palette.h
@@ -249,7 +249,7 @@ public:
class Palette : public Fader {
private:
/**
- * Initialises the first 16 palette indexes with the equivalent
+ * Initializes the first 16 palette indexes with the equivalent
* standard VGA palette
*/
void initVGAPalette(byte *palette);
@@ -300,7 +300,7 @@ public:
void resetGamePalette(int v1, int v2);
/**
- * Initialises the main palette
+ * Initializes the main palette
*/
void initPalette();
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 7b54034753..d2d4bd818a 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -154,7 +154,7 @@ void Scene::loadScene(int sceneId, const Common::String &prefix, bool palFlag) {
_sceneInfo->load(_currentSceneId, _variant, Common::String(), flags,
_depthSurface, _backgroundSurface);
- // Initialise palette animation for the scene
+ // Initialize palette animation for the scene
initPaletteAnimation(_sceneInfo->_paletteCycles, false);
// Copy over nodes
diff --git a/engines/mads/scene.h b/engines/mads/scene.h
index 7a01d7360a..c53c4d64ab 100644
--- a/engines/mads/scene.h
+++ b/engines/mads/scene.h
@@ -53,7 +53,7 @@ private:
void loadVocabStrings();
/*
- * Initialises the data for palette animation within the scene
+ * Initializes the data for palette animation within the scene
*/
void initPaletteAnimation(Common::Array<PaletteCycle> &palCycles, bool animFlag);
diff --git a/engines/mads/screen.h b/engines/mads/screen.h
index b81fddd87a..a3653d6d62 100644
--- a/engines/mads/screen.h
+++ b/engines/mads/screen.h
@@ -209,7 +209,7 @@ public:
ScreenSurface();
/**
- * Initialise the surface
+ * Initialize the surface
*/
void init();
diff --git a/engines/mads/sound.h b/engines/mads/sound.h
index 0fd9ac1095..9a251f9dd0 100644
--- a/engines/mads/sound.h
+++ b/engines/mads/sound.h
@@ -47,7 +47,7 @@ public:
~SoundManager();
/**
- * Initialises the sound driver for a given game section
+ * Initializes the sound driver for a given game section
*/
void init(int sectionNumber);