aboutsummaryrefslogtreecommitdiff
path: root/engines/m4
diff options
context:
space:
mode:
Diffstat (limited to 'engines/m4')
-rw-r--r--engines/m4/animation.cpp12
-rw-r--r--engines/m4/animation.h2
-rw-r--r--engines/m4/compression.cpp8
-rw-r--r--engines/m4/compression.h2
-rw-r--r--engines/m4/gui.h2
-rw-r--r--engines/m4/m4.cpp2
-rw-r--r--engines/m4/m4.h2
-rw-r--r--engines/m4/mads_anim.cpp2
-rw-r--r--engines/m4/mads_logic.cpp6
-rw-r--r--engines/m4/mads_logic.h4
-rw-r--r--engines/m4/mads_menus.cpp10
-rw-r--r--engines/m4/mads_menus.h4
-rw-r--r--engines/m4/mads_scene.cpp12
-rw-r--r--engines/m4/mads_scene.h6
-rw-r--r--engines/m4/mads_views.h2
15 files changed, 38 insertions, 38 deletions
diff --git a/engines/m4/animation.cpp b/engines/m4/animation.cpp
index c89f74bd0a..39a3f175cd 100644
--- a/engines/m4/animation.cpp
+++ b/engines/m4/animation.cpp
@@ -61,9 +61,9 @@ MadsAnimation::~MadsAnimation() {
#define FILENAME_SIZE 13
/**
- * Initialises and loads the data of an animation
+ * Initializes and loads the data of an animation
*/
-void MadsAnimation::initialise(const Common::String &filename, uint16 flags, M4Surface *surface, M4Surface *depthSurface) {
+void MadsAnimation::initialize(const Common::String &filename, uint16 flags, M4Surface *surface, M4Surface *depthSurface) {
MadsPack anim(filename.c_str(), _vm);
bool madsRes = filename[0] == '*';
char buffer[20];
@@ -131,7 +131,7 @@ void MadsAnimation::initialise(const Common::String &filename, uint16 flags, M4S
if (flags & 0x100)
loadInterface(surface, depthSurface);
- // Initialise the reference list
+ // Initialize the reference list
for (int i = 0; i < spriteListCount; ++i)
_spriteListIndexes.push_back(-1);
@@ -266,7 +266,7 @@ void MadsAnimation::initialise(const Common::String &filename, uint16 flags, M4S
* Loads an animation file for display
*/
void MadsAnimation::load(const Common::String &filename, int abortTimers) {
- initialise(filename, 0, NULL, NULL);
+ initialize(filename, 0, NULL, NULL);
_messageCtr = 0;
_skipLoad = true;
@@ -279,7 +279,7 @@ void MadsAnimation::load(const Common::String &filename, int abortTimers) {
}
*/
- // Initialise miscellaneous fields
+ // Initialize miscellaneous fields
_currentFrame = 0;
_oldFrameEntry = 0;
_nextFrameTimer = _madsVm->_currentTimer;
@@ -289,7 +289,7 @@ void MadsAnimation::load(const Common::String &filename, int abortTimers) {
if (_madsVm->_scene)
_actionNouns = _madsVm->scene()->_action._action;
- // Initialise kernel message list
+ // Initialize kernel message list
for (uint i = 0; i < _messages.size(); ++i)
_messages[i].kernelMsgIndex = -1;
}
diff --git a/engines/m4/animation.h b/engines/m4/animation.h
index ed6f49786d..68a2883241 100644
--- a/engines/m4/animation.h
+++ b/engines/m4/animation.h
@@ -111,7 +111,7 @@ public:
MadsAnimation(MadsM4Engine *vm, MadsView *view);
virtual ~MadsAnimation();
- virtual void initialise(const Common::String &filename, uint16 flags, M4Surface *surface, M4Surface *depthSurface);
+ virtual void initialize(const Common::String &filename, uint16 flags, M4Surface *surface, M4Surface *depthSurface);
virtual void load(const Common::String &filename, int abortTimers);
virtual void update();
virtual void setCurrentFrame(int frameNumber);
diff --git a/engines/m4/compression.cpp b/engines/m4/compression.cpp
index 4ec9fae32f..65a25c14e3 100644
--- a/engines/m4/compression.cpp
+++ b/engines/m4/compression.cpp
@@ -44,16 +44,16 @@ bool MadsPack::isCompressed(Common::SeekableReadStream *stream) {
}
MadsPack::MadsPack(Common::SeekableReadStream *stream) {
- initialise(stream);
+ initialize(stream);
}
MadsPack::MadsPack(const char *resourceName, MadsM4Engine* vm) {
Common::SeekableReadStream *stream = vm->_resourceManager->get(resourceName);
- initialise(stream);
+ initialize(stream);
vm->_resourceManager->toss(resourceName);
}
-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");
@@ -121,7 +121,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/m4/compression.h b/engines/m4/compression.h
index a24a41da3c..cb0ef74eb7 100644
--- a/engines/m4/compression.h
+++ b/engines/m4/compression.h
@@ -45,7 +45,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/m4/gui.h b/engines/m4/gui.h
index 99b44a3af7..2b673d624c 100644
--- a/engines/m4/gui.h
+++ b/engines/m4/gui.h
@@ -443,7 +443,7 @@ public:
GameInterfaceView(MadsM4Engine *vm, const Common::Rect &rect): View(vm, rect) {}
~GameInterfaceView() {}
- virtual void initialise() {}
+ virtual void initialize() {}
virtual void setSelectedObject(int objectNumber) {}
virtual void addObjectToInventory(int objectNumber) {}
};
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index d456accca1..93f5ab4cba 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -530,7 +530,7 @@ Common::Error MadsEngine::run() {
//debugCN(kDebugCore, "%s\n----------\n", _globals->loadMessage(i));
if (getGameType() == GType_RexNebular) {
- MadsGameLogic::initialiseGlobals();
+ MadsGameLogic::initializeGlobals();
_scene = NULL;
loadMenu(MAIN_MENU);
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index 4c9b100117..18c3936db8 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -223,7 +223,7 @@ public:
void startScene(int sceneNum) {
if (!_scene) {
_scene = new MadsScene(this);
- ((MadsScene *)_scene)->initialise();
+ ((MadsScene *)_scene)->initialize();
}
_scene->show();
_scene->loadScene(101);
diff --git a/engines/m4/mads_anim.cpp b/engines/m4/mads_anim.cpp
index dc2758bedc..d35b31943a 100644
--- a/engines/m4/mads_anim.cpp
+++ b/engines/m4/mads_anim.cpp
@@ -603,7 +603,7 @@ static bool tempFlag = true;//****DEBUG - Temporarily allow me to skip several i
flags |= 0x100;
_activeAnimation = new MadsAnimation(_vm, this);
- _activeAnimation->initialise(_currentLine, flags, &_backgroundSurface, &_codeSurface);
+ _activeAnimation->initialize(_currentLine, flags, &_backgroundSurface, &_codeSurface);
if (_startFrame != -1)
_activeAnimation->setCurrentFrame(_startFrame);
diff --git a/engines/m4/mads_logic.cpp b/engines/m4/mads_logic.cpp
index a28d38080b..a73e943f4f 100644
--- a/engines/m4/mads_logic.cpp
+++ b/engines/m4/mads_logic.cpp
@@ -31,7 +31,7 @@
namespace M4 {
-void MadsGameLogic::initialiseGlobals() {
+void MadsGameLogic::initializeGlobals() {
// Clear the entire globals list
Common::set_to(&_madsVm->globals()->_globals[0], &_madsVm->globals()->_globals[TOTAL_NUM_VARIABLES], 0);
@@ -170,7 +170,7 @@ const char *MadsSceneLogic::_opcodeStrings[] = {
* convert game specific offsets for various fields in the original game's data segment into a generic data index
* that will be common across all the MADS games
-void MadsSceneLogic::initialiseDataMap() {
+void MadsSceneLogic::initializeDataMap() {
// The unique order of these items must be maintained
}
*/
@@ -382,7 +382,7 @@ void MadsSceneLogic::getPlayerSpritesPrefix2() {
/**
* Loads the MADS.DAT file and loads the script data for the correct game/language
*/
-void MadsSceneLogic::initialiseScripts() {
+void MadsSceneLogic::initializeScripts() {
Common::File f;
if (!f.open("mads.dat")) {
warning("Could not locate mads.dat file");
diff --git a/engines/m4/mads_logic.h b/engines/m4/mads_logic.h
index 016adb2ebf..3132094252 100644
--- a/engines/m4/mads_logic.h
+++ b/engines/m4/mads_logic.h
@@ -92,7 +92,7 @@ public:
MadsSceneLogic() { _scriptsData = NULL; }
~MadsSceneLogic() { delete _scriptsData; }
- void initialiseScripts();
+ void initializeScripts();
void selectScene(int sceneNum);
void setupScene();
@@ -109,7 +109,7 @@ public:
class MadsGameLogic {
public:
- static void initialiseGlobals();
+ static void initializeGlobals();
};
}
diff --git a/engines/m4/mads_menus.cpp b/engines/m4/mads_menus.cpp
index a6e2b77253..fa65329d76 100644
--- a/engines/m4/mads_menus.cpp
+++ b/engines/m4/mads_menus.cpp
@@ -596,18 +596,18 @@ RexDialogView::RexDialogView(): View(_madsVm, Common::Rect(0, 0, _madsVm->_scree
MadsView(this) {
_screenType = VIEWID_MENU;
- // Initialise class variables
+ // Initialize class variables
_priorSceneId = _madsVm->_scene->getCurrentScene();
_dialogType = DIALOG_NONE;
// Load necessary quotes
_madsVm->globals()->loadQuoteRange(1, 48);
- initialiseLines();
- initialiseGraphics();
+ initializeLines();
+ initializeGraphics();
}
-void RexDialogView::initialiseLines() {
+void RexDialogView::initializeLines() {
// Set up a list of blank entries for use in the various dialogs
for (int i = 0; i < DIALOG_LINES_SIZE; ++i) {
DialogTextEntry rec;
@@ -622,7 +622,7 @@ void RexDialogView::initialiseLines() {
_spriteSlots[0].seqIndex = -1;
}
-void RexDialogView::initialiseGraphics() {
+void RexDialogView::initializeGraphics() {
// Set needed palette entries
_madsVm->_palette->blockRange(0, 16);
_madsVm->_palette->setEntry(10, 0, 255, 0);
diff --git a/engines/m4/mads_menus.h b/engines/m4/mads_menus.h
index 766767dc84..4d3ea5da39 100644
--- a/engines/m4/mads_menus.h
+++ b/engines/m4/mads_menus.h
@@ -117,8 +117,8 @@ class RexDialogView : public View, public MadsView {
private:
int _priorSceneId;
- void initialiseLines();
- void initialiseGraphics();
+ void initializeLines();
+ void initializeGraphics();
void loadBackground();
void loadMenuSprites();
protected:
diff --git a/engines/m4/mads_scene.cpp b/engines/m4/mads_scene.cpp
index b305242bbb..1a44c49f00 100644
--- a/engines/m4/mads_scene.cpp
+++ b/engines/m4/mads_scene.cpp
@@ -94,12 +94,12 @@ void MadsScene::loadScene2(const char *aaName, int sceneNumber) {
// Load scene walk paths
loadSceneCodes(_currentScene);
- // Initialise the scene animation
+ // Initialize the scene animation
uint16 flags = 0x4100;
if (_madsVm->globals()->_config.textWindowStill)
flags |= 0x200;
- _sceneAnimation->initialise(aaName, flags, _interfaceSurface, NULL);
+ _sceneAnimation->initialize(aaName, flags, _interfaceSurface, NULL);
}
/**
@@ -113,7 +113,7 @@ void MadsScene::loadSceneTemporary() {
{0x00<<2, 0x10<<2, 0x16<<2}};
_vm->_palette->setPalette(&sysColors[0], 4, 3);
- _interfaceSurface->initialise();
+ _interfaceSurface->initialize();
loadSceneHotspots(_currentScene);
@@ -596,7 +596,7 @@ void MadsSceneResources::load(int sceneNumber, const char *resName, int v0, M4Su
char buffer1[80];
const char *sceneName;
- // TODO: Initialise spriteSet / xp_list
+ // TODO: Initialize spriteSet / xp_list
if (sceneNumber > 0) {
sceneName = MADSResourceManager::getResourceName(RESPREFIX_RM, sceneNumber, ".DAT");
@@ -668,7 +668,7 @@ void MadsSceneResources::load(int sceneNumber, const char *resName, int v0, M4Su
delete stream;
- // Initialise a copy of the surfaces if they weren't provided
+ // Initialize a copy of the surfaces if they weren't provided
bool dsFlag = false, ssFlag = false;
if (!surface) {
surface = new M4Surface(_width, _height);
@@ -864,7 +864,7 @@ void MadsInterfaceView::setFontMode(InterfaceFontMode newMode) {
}
}
-void MadsInterfaceView::initialise() {
+void MadsInterfaceView::initialize() {
// Build up the inventory list
_inventoryList.clear();
diff --git a/engines/m4/mads_scene.h b/engines/m4/mads_scene.h
index 12d7088a2f..9835de4daf 100644
--- a/engines/m4/mads_scene.h
+++ b/engines/m4/mads_scene.h
@@ -108,8 +108,8 @@ public:
public:
MadsScene(MadsEngine *vm);
virtual ~MadsScene();
- void initialise() {
- _sceneLogic.initialiseScripts();
+ void initialize() {
+ _sceneLogic.initializeScripts();
}
// Methods that differ between engines
@@ -177,7 +177,7 @@ public:
MadsInterfaceView(MadsM4Engine *vm);
~MadsInterfaceView();
- virtual void initialise();
+ virtual void initialize();
virtual void setSelectedObject(int objectNumber);
virtual void addObjectToInventory(int objectNumber);
int getSelectedObject() { return _selectedObject; }
diff --git a/engines/m4/mads_views.h b/engines/m4/mads_views.h
index 72a70cfbc0..e49c9e6d94 100644
--- a/engines/m4/mads_views.h
+++ b/engines/m4/mads_views.h
@@ -447,7 +447,7 @@ protected:
public:
Animation(MadsM4Engine *vm);
virtual ~Animation();
- virtual void initialise(const Common::String &filename, uint16 flags, M4Surface *surface, M4Surface *depthSurface) = 0;
+ virtual void initialize(const Common::String &filename, uint16 flags, M4Surface *surface, M4Surface *depthSurface) = 0;
virtual void load(const Common::String &filename, int v0) = 0;
virtual void update() = 0;
virtual void setCurrentFrame(int frameNumber) = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 09:41:55 +0000