aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
diff options
context:
space:
mode:
authorMatthew Hoops2011-05-25 11:17:11 -0400
committerMatthew Hoops2011-05-25 11:17:11 -0400
commit9539017ee35ce280758f22e589aa52c3baf9aaf3 (patch)
tree38578935a8649fcf2b052503365fbb5320a42103 /engines/sword2
parent7ff9f34aef3a89f167f1867fb31147571ba8112a (diff)
downloadscummvm-rg350-9539017ee35ce280758f22e589aa52c3baf9aaf3.tar.gz
scummvm-rg350-9539017ee35ce280758f22e589aa52c3baf9aaf3.tar.bz2
scummvm-rg350-9539017ee35ce280758f22e589aa52c3baf9aaf3.zip
ALL: initialise -> initialize
Diffstat (limited to 'engines/sword2')
-rw-r--r--engines/sword2/console.cpp6
-rw-r--r--engines/sword2/icons.cpp2
-rw-r--r--engines/sword2/interpreter.cpp4
-rw-r--r--engines/sword2/layers.cpp26
-rw-r--r--engines/sword2/maketext.cpp12
-rw-r--r--engines/sword2/render.cpp18
-rw-r--r--engines/sword2/router.h2
-rw-r--r--engines/sword2/screen.cpp14
-rw-r--r--engines/sword2/screen.h8
-rw-r--r--engines/sword2/sword2.cpp4
-rw-r--r--engines/sword2/sword2.h4
11 files changed, 50 insertions, 50 deletions
diff --git a/engines/sword2/console.cpp b/engines/sword2/console.cpp
index 8d95670308..957b2431e0 100644
--- a/engines/sword2/console.cpp
+++ b/engines/sword2/console.cpp
@@ -779,19 +779,19 @@ bool Debugger::Cmd_Sfx(int argc, const char **argv) {
}
bool Debugger::Cmd_English(int argc, const char **argv) {
- _vm->initialiseFontResourceFlags(DEFAULT_TEXT);
+ _vm->initializeFontResourceFlags(DEFAULT_TEXT);
DebugPrintf("Default fonts selected\n");
return true;
}
bool Debugger::Cmd_Finnish(int argc, const char **argv) {
- _vm->initialiseFontResourceFlags(FINNISH_TEXT);
+ _vm->initializeFontResourceFlags(FINNISH_TEXT);
DebugPrintf("Finnish fonts selected\n");
return true;
}
bool Debugger::Cmd_Polish(int argc, const char **argv) {
- _vm->initialiseFontResourceFlags(POLISH_TEXT);
+ _vm->initializeFontResourceFlags(POLISH_TEXT);
DebugPrintf("Polish fonts selected\n");
return true;
}
diff --git a/engines/sword2/icons.cpp b/engines/sword2/icons.cpp
index f179f3c899..a555e63449 100644
--- a/engines/sword2/icons.cpp
+++ b/engines/sword2/icons.cpp
@@ -147,7 +147,7 @@ void Mouse::buildMenu() {
}
}
- // Initialise the menu from the master list.
+ // Initialize the menu from the master list.
for (i = 0; i < 15; i++) {
uint32 res = _masterMenuList[i].icon_resource;
diff --git a/engines/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp
index fbfb03cf61..e7fb979d69 100644
--- a/engines/sword2/interpreter.cpp
+++ b/engines/sword2/interpreter.cpp
@@ -264,7 +264,7 @@ int Logic::runScript2(byte *scriptData, byte *objectData, byte *offsetPtr) {
// int32_TYPE 1 numberOfScripts
// int32_TYPE numberOfScripts The offsets for each script
- // Initialise some stuff
+ // Initialize some stuff
uint32 ip = 0; // Code pointer
int scriptNumber;
@@ -614,7 +614,7 @@ int Logic::runScript2(byte *scriptData, byte *objectData, byte *offsetPtr) {
// The scripts do not always call the mcode command
// with as many parameters as it can accept. To keep
- // things predictable, initialise the remaining
+ // things predictable, initialize the remaining
// parameters to 0.
for (i = STACK_SIZE - 1; i >= value; i--) {
diff --git a/engines/sword2/layers.cpp b/engines/sword2/layers.cpp
index ad65336c0f..b13006cd70 100644
--- a/engines/sword2/layers.cpp
+++ b/engines/sword2/layers.cpp
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-// high level layer initialising
+// high level layer initializing
// the system supports:
// 1 optional background parallax layer
@@ -97,7 +97,7 @@ void Screen::initBackground(int32 res, int32 new_palette) {
debug(2, "layers=%d width=%d depth=%d", screen_head.noLayers, screen_head.width, screen_head.height);
- // initialise the driver back buffer
+ // initialize the driver back buffer
setLocationMetrics(screen_head.width, screen_head.height);
for (i = 0; i < screen_head.noLayers; i++) {
@@ -180,22 +180,22 @@ void Screen::initBackground(int32 res, int32 new_palette) {
for (i = 0; i < 2; i++) {
if (screenLayerTable.bg_parallax[i])
- initialiseBackgroundLayer(_vm->fetchBackgroundParallaxLayer(file, i));
+ initializeBackgroundLayer(_vm->fetchBackgroundParallaxLayer(file, i));
else
- initialiseBackgroundLayer(NULL);
+ initializeBackgroundLayer(NULL);
}
// Normal backround layer
- initialiseBackgroundLayer(_vm->fetchBackgroundLayer(file));
+ initializeBackgroundLayer(_vm->fetchBackgroundLayer(file));
// Foreground parallax layers
for (i = 0; i < 2; i++) {
if (screenLayerTable.fg_parallax[i])
- initialiseBackgroundLayer(_vm->fetchForegroundParallaxLayer(file, i));
+ initializeBackgroundLayer(_vm->fetchForegroundParallaxLayer(file, i));
else
- initialiseBackgroundLayer(NULL);
+ initializeBackgroundLayer(NULL);
}
_vm->_resman->closeResource(_thisScreen.background_layer_id);
@@ -243,7 +243,7 @@ void Screen::initPsxBackground(int32 res, int32 new_palette) {
debug(2, "layers=%d width=%d depth=%d", screen_head.noLayers, screen_head.width, screen_head.height);
- // initialise the driver back buffer
+ // initialize the driver back buffer
setLocationMetrics(screen_head.width, screen_head.height);
for (i = 0; i < screen_head.noLayers; i++) {
@@ -279,15 +279,15 @@ void Screen::initPsxBackground(int32 res, int32 new_palette) {
_thisScreen.feet_y = 340;
// Background parallax layers
- initialisePsxParallaxLayer(_vm->fetchBackgroundParallaxLayer(file, 0));
- initialisePsxParallaxLayer(NULL);
+ initializePsxParallaxLayer(_vm->fetchBackgroundParallaxLayer(file, 0));
+ initializePsxParallaxLayer(NULL);
// Normal backround layer
- initialisePsxBackgroundLayer(_vm->fetchBackgroundLayer(file));
+ initializePsxBackgroundLayer(_vm->fetchBackgroundLayer(file));
// Foreground parallax layers
- initialisePsxParallaxLayer(_vm->fetchForegroundParallaxLayer(file, 1));
- initialisePsxParallaxLayer(NULL);
+ initializePsxParallaxLayer(_vm->fetchForegroundParallaxLayer(file, 1));
+ initializePsxParallaxLayer(NULL);
_vm->_resman->closeResource(_thisScreen.background_layer_id);
diff --git a/engines/sword2/maketext.cpp b/engines/sword2/maketext.cpp
index 804862e13f..e279284d76 100644
--- a/engines/sword2/maketext.cpp
+++ b/engines/sword2/maketext.cpp
@@ -636,7 +636,7 @@ void FontRenderer::killTextBloc(uint32 bloc_number) {
#define SAVE_LINE_NO 1
-void Sword2Engine::initialiseFontResourceFlags() {
+void Sword2Engine::initializeFontResourceFlags() {
byte *textFile = _resman->openResource(TEXT_RES);
// If language is Polish or Finnish it requires alternate fonts.
@@ -649,11 +649,11 @@ void Sword2Engine::initialiseFontResourceFlags() {
char *textLine = (char *)fetchTextLine(textFile, SAVE_LINE_NO) + 2;
if (strcmp(textLine, "tallenna") == 0)
- initialiseFontResourceFlags(FINNISH_TEXT);
+ initializeFontResourceFlags(FINNISH_TEXT);
else if (strcmp(textLine, "zapisz") == 0)
- initialiseFontResourceFlags(POLISH_TEXT);
+ initializeFontResourceFlags(POLISH_TEXT);
else
- initialiseFontResourceFlags(DEFAULT_TEXT);
+ initializeFontResourceFlags(DEFAULT_TEXT);
// Get the game name for the windows application
@@ -677,10 +677,10 @@ void Sword2Engine::initialiseFontResourceFlags() {
}
/**
- * Called from initialiseFontResourceFlags(), and also from console.cpp
+ * Called from initializeFontResourceFlags(), and also from console.cpp
*/
-void Sword2Engine::initialiseFontResourceFlags(uint8 language) {
+void Sword2Engine::initializeFontResourceFlags(uint8 language) {
switch (language) {
case FINNISH_TEXT:
_speechFontId = FINNISH_SPEECH_FONT_ID;
diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp
index e3bce7d27f..1e068d6061 100644
--- a/engines/sword2/render.cpp
+++ b/engines/sword2/render.cpp
@@ -342,10 +342,10 @@ void Screen::renderParallax(byte *ptr, int16 l) {
#define LIMIT_FRAME_RATE
/**
- * Initialises the timers before the render loop is entered.
+ * Initializes the timers before the render loop is entered.
*/
-void Screen::initialiseRenderCycle() {
+void Screen::initializeRenderCycle() {
_initialTime = _vm->_system->getMillis();
_totalTime = _initialTime + (1000 / _vm->getFramesPerSecond());
}
@@ -399,7 +399,7 @@ bool Screen::endRenderCycle() {
renderCountIndex = 0;
if (_renderTooSlow) {
- initialiseRenderCycle();
+ initializeRenderCycle();
return true;
}
@@ -461,13 +461,13 @@ void Screen::resetRenderEngine() {
* or a NULL pointer in order of background parallax to foreground parallax.
*/
-int32 Screen::initialiseBackgroundLayer(byte *parallax) {
+int32 Screen::initializeBackgroundLayer(byte *parallax) {
Parallax p;
uint16 i, j, k;
byte *data;
byte *dst;
- debug(2, "initialiseBackgroundLayer");
+ debug(2, "initializeBackgroundLayer");
assert(_layer < MAXLAYERS);
@@ -588,14 +588,14 @@ int32 Screen::initialiseBackgroundLayer(byte *parallax) {
* ratio correction), while PC backgrounds are in tiles of 64x64.
*/
-int32 Screen::initialisePsxBackgroundLayer(byte *parallax) {
+int32 Screen::initializePsxBackgroundLayer(byte *parallax) {
uint16 bgXres, bgYres;
uint16 trueXres, stripeNumber, totStripes;
uint32 baseAddress, stripePos;
uint16 i, j;
byte *dst;
- debug(2, "initialisePsxBackgroundLayer");
+ debug(2, "initializePsxBackgroundLayer");
assert(_layer < MAXLAYERS);
@@ -698,14 +698,14 @@ int32 Screen::initialisePsxBackgroundLayer(byte *parallax) {
* can be understood by renderParallax functions.
*/
-int32 Screen::initialisePsxParallaxLayer(byte *parallax) {
+int32 Screen::initializePsxParallaxLayer(byte *parallax) {
uint16 plxXres, plxYres;
uint16 xTiles, yTiles;
uint16 i, j, k;
byte *data;
byte *dst;
- debug(2, "initialisePsxParallaxLayer");
+ debug(2, "initializePsxParallaxLayer");
assert(_layer < MAXLAYERS);
diff --git a/engines/sword2/router.h b/engines/sword2/router.h
index ec711bcc40..7196ea8df4 100644
--- a/engines/sword2/router.h
+++ b/engines/sword2/router.h
@@ -26,7 +26,7 @@
#define SWORD2_ROUTER_H
// This used to be a variable, but it was never set. Actually, it wasn't even
-// initialised!
+// initialized!
//
// Define this to force the use of slidy router (so solid path not used when
// ending walk in ANY direction)
diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp
index cae719c1d4..0cb951fdfc 100644
--- a/engines/sword2/screen.cpp
+++ b/engines/sword2/screen.cpp
@@ -61,11 +61,11 @@ Screen::Screen(Sword2Engine *vm, int16 width, int16 height) {
_dirtyGrid = (byte *)calloc(_gridWide, _gridDeep);
if (!_dirtyGrid)
- error("Could not initialise dirty grid");
+ error("Could not initialize dirty grid");
_buffer = (byte *)malloc(width * height);
if (!_buffer)
- error("Could not initialise display");
+ error("Could not initialize display");
for (int i = 0; i < ARRAYSIZE(_blockSurfaces); i++)
_blockSurfaces[i] = NULL;
@@ -1225,11 +1225,11 @@ void Screen::rollCredits() {
void Screen::splashScreen() {
byte *bgfile = _vm->_resman->openResource(2950);
- initialiseBackgroundLayer(NULL);
- initialiseBackgroundLayer(NULL);
- initialiseBackgroundLayer(_vm->fetchBackgroundLayer(bgfile));
- initialiseBackgroundLayer(NULL);
- initialiseBackgroundLayer(NULL);
+ initializeBackgroundLayer(NULL);
+ initializeBackgroundLayer(NULL);
+ initializeBackgroundLayer(_vm->fetchBackgroundLayer(bgfile));
+ initializeBackgroundLayer(NULL);
+ initializeBackgroundLayer(NULL);
_vm->fetchPalette(bgfile, _palette);
setPalette(0, 256, _palette, RDPAL_FADE);
diff --git a/engines/sword2/screen.h b/engines/sword2/screen.h
index 2d15692299..11e323d0a7 100644
--- a/engines/sword2/screen.h
+++ b/engines/sword2/screen.h
@@ -390,12 +390,12 @@ public:
void resetRenderLists();
void setLocationMetrics(uint16 w, uint16 h);
- int32 initialiseBackgroundLayer(byte *parallax);
- int32 initialisePsxParallaxLayer(byte *parallax); // These are used to initialize psx backgrounds and
- int32 initialisePsxBackgroundLayer(byte *parallax); // parallaxes, which are different from pc counterparts.
+ int32 initializeBackgroundLayer(byte *parallax);
+ int32 initializePsxParallaxLayer(byte *parallax); // These are used to initialize psx backgrounds and
+ int32 initializePsxBackgroundLayer(byte *parallax); // parallaxes, which are different from pc counterparts.
void closeBackgroundLayer();
- void initialiseRenderCycle();
+ void initializeRenderCycle();
void initBackground(int32 res, int32 new_palette);
void initPsxBackground(int32 res, int32 new_palette);
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index bc34e15236..62a391923d 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -425,7 +425,7 @@ Common::Error Sword2Engine::run() {
setInputEventFilter(RD_LEFTBUTTONUP | RD_RIGHTBUTTONUP | RD_WHEELUP | RD_WHEELDOWN);
setupPersistentResources();
- initialiseFontResourceFlags();
+ initializeFontResourceFlags();
if (_features & GF_DEMO)
_logic->writeVar(DEMO, 1);
@@ -463,7 +463,7 @@ Common::Error Sword2Engine::run() {
} else
startGame();
- _screen->initialiseRenderCycle();
+ _screen->initializeRenderCycle();
while (1) {
_debugger->onFrame();
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 27cbd9e49d..e4c9dcca3c 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -233,8 +233,8 @@ public:
void sleepUntil(uint32 time);
- void initialiseFontResourceFlags();
- void initialiseFontResourceFlags(uint8 language);
+ void initializeFontResourceFlags();
+ void initializeFontResourceFlags(uint8 language);
bool initStartMenu();
void registerStartPoint(int32 key, char *name);