aboutsummaryrefslogtreecommitdiff
path: root/engines/hugo
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/hugo
parent7ff9f34aef3a89f167f1867fb31147571ba8112a (diff)
downloadscummvm-rg350-9539017ee35ce280758f22e589aa52c3baf9aaf3.tar.gz
scummvm-rg350-9539017ee35ce280758f22e589aa52c3baf9aaf3.tar.bz2
scummvm-rg350-9539017ee35ce280758f22e589aa52c3baf9aaf3.zip
ALL: initialise -> initialize
Diffstat (limited to 'engines/hugo')
-rw-r--r--engines/hugo/hugo.cpp2
-rw-r--r--engines/hugo/object_v1d.cpp2
-rw-r--r--engines/hugo/object_v1w.cpp2
-rw-r--r--engines/hugo/object_v2d.cpp2
-rw-r--r--engines/hugo/schedule.cpp26
-rw-r--r--engines/hugo/schedule.h16
6 files changed, 25 insertions, 25 deletions
diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index 7d35aec972..6a0eaac331 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -593,7 +593,7 @@ void HugoEngine::initialize() {
_scheduler->initEventQueue(); // Init scheduler stuff
_screen->initDisplay(); // Create Dibs and palette
_file->openDatabaseFiles(); // Open database files
- calcMaxScore(); // Initialise maxscore
+ calcMaxScore(); // Initialize maxscore
_rnd = new Common::RandomSource("hugo");
_rnd->setSeed(42); // Kick random number generator
diff --git a/engines/hugo/object_v1d.cpp b/engines/hugo/object_v1d.cpp
index 297a856203..ecdbb3b4c6 100644
--- a/engines/hugo/object_v1d.cpp
+++ b/engines/hugo/object_v1d.cpp
@@ -58,7 +58,7 @@ ObjectHandler_v1d::~ObjectHandler_v1d() {
void ObjectHandler_v1d::updateImages() {
debugC(5, kDebugObject, "updateImages");
- // Initialise the index array to visible objects in current screen
+ // Initialize the index array to visible objects in current screen
int num_objs = 0;
byte objindex[kMaxObjNumb]; // Array of indeces to objects
diff --git a/engines/hugo/object_v1w.cpp b/engines/hugo/object_v1w.cpp
index 098acdf367..11c09176e5 100644
--- a/engines/hugo/object_v1w.cpp
+++ b/engines/hugo/object_v1w.cpp
@@ -58,7 +58,7 @@ ObjectHandler_v1w::~ObjectHandler_v1w() {
void ObjectHandler_v1w::updateImages() {
debugC(5, kDebugObject, "updateImages");
- // Initialise the index array to visible objects in current screen
+ // Initialize the index array to visible objects in current screen
int num_objs = 0;
byte objindex[kMaxObjNumb]; // Array of indeces to objects
diff --git a/engines/hugo/object_v2d.cpp b/engines/hugo/object_v2d.cpp
index 3a98885ebe..c9e5104972 100644
--- a/engines/hugo/object_v2d.cpp
+++ b/engines/hugo/object_v2d.cpp
@@ -58,7 +58,7 @@ ObjectHandler_v2d::~ObjectHandler_v2d() {
void ObjectHandler_v2d::updateImages() {
debugC(5, kDebugObject, "updateImages");
- // Initialise the index array to visible objects in current screen
+ // Initialize the index array to visible objects in current screen
int num_objs = 0;
byte objindex[kMaxObjNumb]; // Array of indeces to objects
diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp
index 7e66f34af2..a099bec21c 100644
--- a/engines/hugo/schedule.cpp
+++ b/engines/hugo/schedule.cpp
@@ -61,7 +61,7 @@ void Scheduler::initCypher() {
}
/**
- * Initialise the timer event queue
+ * Initialize the timer event queue
*/
void Scheduler::initEventQueue() {
debugC(1, kDebugSchedule, "initEventQueue");
@@ -159,7 +159,7 @@ void Scheduler::processBonus(const int bonusIndex) {
* 2. Set the new screen (in the hero object and any carried objects)
* 3. Read in the screen files for the new screen
* 4. Schedule action list for new screen
- * 5. Initialise prompt line and status line
+ * 5. Initialize prompt line and status line
*/
void Scheduler::newScreen(const int screenIndex) {
debugC(1, kDebugSchedule, "newScreen(%d)", screenIndex);
@@ -193,7 +193,7 @@ void Scheduler::newScreen(const int screenIndex) {
// 4. Schedule action list for this screen
_vm->_scheduler->screenActions(screenIndex);
- // 5. Initialise prompt line and status line
+ // 5. Initialize prompt line and status line
_vm->_screen->initNewScreenDisplay();
}
@@ -201,7 +201,7 @@ void Scheduler::newScreen(const int screenIndex) {
* Transition to a new screen as follows:
* 1. Set the new screen (in the hero object and any carried objects)
* 2. Read in the screen files for the new screen
- * 3. Initialise prompt line and status line
+ * 3. Initialize prompt line and status line
*/
void Scheduler::restoreScreen(const int screenIndex) {
debugC(1, kDebugSchedule, "restoreScreen(%d)", screenIndex);
@@ -212,7 +212,7 @@ void Scheduler::restoreScreen(const int screenIndex) {
// 2. Read in new screen files
_vm->readScreenFiles(screenIndex);
- // 3. Initialise prompt line and status line
+ // 3. Initialize prompt line and status line
_vm->_screen->initNewScreenDisplay();
}
@@ -1135,7 +1135,7 @@ void Scheduler::restoreEvents(Common::ReadStream *f) {
void Scheduler::insertAction(act *action) {
debugC(1, kDebugSchedule, "insertAction() - Action type A%d", action->a0.actType);
- // First, get and initialise the event structure
+ // First, get and initialize the event structure
event_t *curEvent = getQueue();
curEvent->action = action;
switch (action->a0.actType) { // Assign whether local or global
@@ -1208,7 +1208,7 @@ event_t *Scheduler::doAction(event_t *curEvent) {
_vm->_object->_objects[action->a1.objIndex].cycleNumb = action->a1.cycleNumb;
_vm->_object->_objects[action->a1.objIndex].cycling = action->a1.cycle;
break;
- case INIT_OBJXY: // act2: Initialise an object
+ case INIT_OBJXY: // act2: Initialize an object
_vm->_object->_objects[action->a2.objIndex].x = action->a2.x; // Coordinates
_vm->_object->_objects[action->a2.objIndex].y = action->a2.y;
break;
@@ -1218,13 +1218,13 @@ event_t *Scheduler::doAction(event_t *curEvent) {
case BKGD_COLOR: // act4: Set new background color
_vm->_screen->setBackgroundColor(action->a4.newBackgroundColor);
break;
- case INIT_OBJVXY: // act5: Initialise an object velocity
+ case INIT_OBJVXY: // act5: Initialize an object velocity
_vm->_object->setVelocity(action->a5.objIndex, action->a5.vx, action->a5.vy);
break;
- case INIT_CARRY: // act6: Initialise an object
+ case INIT_CARRY: // act6: Initialize an object
_vm->_object->setCarry(action->a6.objIndex, action->a6.carriedFl); // carried status
break;
- case INIT_HF_COORD: // act7: Initialise an object to hero's "feet" coords
+ case INIT_HF_COORD: // act7: Initialize an object to hero's "feet" coords
_vm->_object->_objects[action->a7.objIndex].x = _vm->_hero->x - 1;
_vm->_object->_objects[action->a7.objIndex].y = _vm->_hero->y + _vm->_hero->currImagePtr->y2 - 1;
_vm->_object->_objects[action->a7.objIndex].screenIndex = *_vm->_screen_p; // Don't forget screen!
@@ -1232,10 +1232,10 @@ event_t *Scheduler::doAction(event_t *curEvent) {
case NEW_SCREEN: // act8: Start new screen
newScreen(action->a8.screenIndex);
break;
- case INIT_OBJSTATE: // act9: Initialise an object state
+ case INIT_OBJSTATE: // act9: Initialize an object state
_vm->_object->_objects[action->a9.objIndex].state = action->a9.newState;
break;
- case INIT_PATH: // act10: Initialise an object path and velocity
+ case INIT_PATH: // act10: Initialize an object path and velocity
_vm->_object->setPath(action->a10.objIndex, (path_t) action->a10.newPathType, action->a10.vxPath, action->a10.vyPath);
break;
case COND_R: // act11: action lists conditional on object state
@@ -1284,7 +1284,7 @@ event_t *Scheduler::doAction(event_t *curEvent) {
// any objects are to be made invisible!
gameStatus.gameOverFl = true;
break;
- case INIT_HH_COORD: // act22: Initialise an object to hero's actual coords
+ case INIT_HH_COORD: // act22: Initialize an object to hero's actual coords
_vm->_object->_objects[action->a22.objIndex].x = _vm->_hero->x;
_vm->_object->_objects[action->a22.objIndex].y = _vm->_hero->y;
_vm->_object->_objects[action->a22.objIndex].screenIndex = *_vm->_screen_p;// Don't forget screen!
diff --git a/engines/hugo/schedule.h b/engines/hugo/schedule.h
index 003974f2fa..e3107809cf 100644
--- a/engines/hugo/schedule.h
+++ b/engines/hugo/schedule.h
@@ -73,7 +73,7 @@ enum action_t { // Parameters:
INIT_MAZE, // 30 - Start special maze hotspot processing
EXIT_MAZE, // 31 - Exit special maze processing
INIT_PRIORITY, // 32 - Initialize fbg field
- INIT_SCREEN, // 33 - Initialise screen field of object
+ INIT_SCREEN, // 33 - Initialize screen field of object
AGSCHEDULE, // 34 - Global schedule - lasts over new screen
REMAPPAL, // 35 - Remappe palette - palette index, color
COND_NOUN, // 36 - Conditional on noun appearing in line
@@ -106,7 +106,7 @@ struct act1 { // Type 1 - Start an object
cycle_t cycle; // Direction to start cycling
};
-struct act2 { // Type 2 - Initialise an object coords
+struct act2 { // Type 2 - Initialize an object coords
action_t actType; // The type of action
int timer; // Time to set off the action
int objIndex; // The object number
@@ -129,21 +129,21 @@ struct act4 { // Type 4 - Set new backgrou
long newBackgroundColor; // New color
};
-struct act5 { // Type 5 - Initialise an object velocity
+struct act5 { // Type 5 - Initialize an object velocity
action_t actType; // The type of action
int timer; // Time to set off the action
int objIndex; // The object number
int vx, vy; // velocity
};
-struct act6 { // Type 6 - Initialise an object carrying
+struct act6 { // Type 6 - Initialize an object carrying
action_t actType; // The type of action
int timer; // Time to set off the action
int objIndex; // The object number
bool carriedFl; // carrying
};
-struct act7 { // Type 7 - Initialise an object to hero's coords
+struct act7 { // Type 7 - Initialize an object to hero's coords
action_t actType; // The type of action
int timer; // Time to set off the action
int objIndex; // The object number
@@ -155,14 +155,14 @@ struct act8 { // Type 8 - switch to new sc
int screenIndex; // The new screen number
};
-struct act9 { // Type 9 - Initialise an object state
+struct act9 { // Type 9 - Initialize an object state
action_t actType; // The type of action
int timer; // Time to set off the action
int objIndex; // The object number
byte newState; // New state
};
-struct act10 { // Type 10 - Initialise an object path type
+struct act10 { // Type 10 - Initialize an object path type
action_t actType; // The type of action
int timer; // Time to set off the action
int objIndex; // The object number
@@ -251,7 +251,7 @@ struct act21 { // Type 21 - Gameover. Disa
int timer; // Time to set off the action
};
-struct act22 { // Type 22 - Initialise an object to hero's coords
+struct act22 { // Type 22 - Initialize an object to hero's coords
action_t actType; // The type of action
int timer; // Time to set off the action
int objIndex; // The object number