thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: initialise -> initialize

Browse source
This commit is contained in:
Matthew Hoops 2011-05-25 11:17:11 -04:00
parent 7ff9f34aef
commit 9539017ee3
121 changed files with 324 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

2
audio/decoders/flac.cpp
View file

@ -303,7 +303,7 @@ int FLACStream::readBuffer(int16 *buffer, const int numSamples) {
const uint numChannels = getChannels();
if (numChannels == 0) {
warning("FLACStream: Stream not successfully initialised, cant playback");
warning("FLACStream: Stream not successfully initialized, cant playback");
return -1; // streaminfo wasnt read!
}

4
audio/mods/tfmx.cpp
View file

@ -332,7 +332,7 @@ void Tfmx::macroRun(ChannelContext &channel) {
channel.vibLength = macroPtr[1];
channel.vibCount = macroPtr[1] / 2;
channel.vibDelta = macroPtr[3];
// TODO: Perhaps a bug, vibValue could be left uninitialised
// TODO: Perhaps a bug, vibValue could be left uninitialized
if (!channel.portaDelta) {
channel.period = channel.refPeriod;
channel.vibValue = 0;
@ -700,7 +700,7 @@ void Tfmx::noteCommand(const uint8 note, const uint8 param1, const uint8 param2,
channel.relVol = param2 >> 4;
channel.fineTune = (int8)param3;
// TODO: the point where the channel gets initialised varies with the games, needs more research.
// TODO: the point where the channel gets initialized varies with the games, needs more research.
initMacroProgramm(channel);
channel.keyUp = false; // key down = playing a Note

14
audio/softsynth/mt32.cpp
View file

@ -63,7 +63,7 @@ protected:
void generateSamples(int16 *buf, int len);
public:
bool _initialising;
bool _initializing;
MidiDriver_MT32(Audio::Mixer *mixer);
virtual ~MidiDriver_MT32();
@ -215,7 +215,7 @@ static MT32Emu::File *MT32_OpenFile(void *userData, const char *filename, MT32Em
}
static void MT32_PrintDebug(void *userData, const char *fmt, va_list list) {
if (((MidiDriver_MT32 *)userData)->_initialising) {
if (((MidiDriver_MT32 *)userData)->_initializing) {
char buf[512];
vsnprintf(buf, 512, fmt, list);
@ -239,7 +239,7 @@ static int MT32_Report(void *userData, MT32Emu::ReportType type, const void *rep
error("Failed to load MT32_PCM.ROM");
break;
case MT32Emu::ReportType_progressInit:
if (((MidiDriver_MT32 *)userData)->_initialising) {
if (((MidiDriver_MT32 *)userData)->_initializing) {
drawProgress(*((const float *)reportData));
return eatSystemEvents();
}
@ -283,7 +283,7 @@ MidiDriver_MT32::MidiDriver_MT32(Audio::Mixer *mixer) : MidiDriver_Emulated(mixe
// at rates other than 32KHz, thus we produce data at 32KHz and
// rely on Mixer to convert.
_outputRate = 32000; //_mixer->getOutputRate();
_initialising = false;
_initializing = false;
}
MidiDriver_MT32::~MidiDriver_MT32() {
@ -324,11 +324,11 @@ int MidiDriver_MT32::open() {
g_system->getPaletteManager()->setPalette(dummy_palette, 0, 3);
}
_initialising = true;
drawMessage(-1, _s("Initialising MT-32 Emulator"));
_initializing = true;
drawMessage(-1, _s("Initializing MT-32 Emulator"));
if (!_synth->open(prop))
return MERR_DEVICE_NOT_AVAILABLE;
_initialising = false;
_initializing = false;
if (screenFormat.bytesPerPixel > 1)
g_system->fillScreen(screenFormat.RGBToColor(0, 0, 0));

2
audio/softsynth/mt32/partial.cpp
View file

@ -164,7 +164,7 @@ void Partial::startPartial(dpoly *usePoly, const PatchCache *useCache, Partial *
structurePosition = patchCache->structurePosition;
play = true;
initKeyFollow(poly->freqnum); // Initialises noteVal, filtVal and realVal
initKeyFollow(poly->freqnum); // Initializes noteVal, filtVal and realVal
#if MT32EMU_ACCURATENOTES == 0
noteLookup = &synth->tables.noteLookups[noteVal - LOWEST_NOTE];
#else

22
audio/softsynth/mt32/synth.cpp
View file

@ -426,36 +426,36 @@ bool Synth::open(SynthProperties &useProp) {
}
}
printDebug("Initialising Timbre Bank A");
printDebug("Initializing Timbre Bank A");
if (!initTimbres(controlROMMap->timbreAMap, controlROMMap->timbreAOffset, 0)) {
return false;
}
printDebug("Initialising Timbre Bank B");
printDebug("Initializing Timbre Bank B");
if (!initTimbres(controlROMMap->timbreBMap, controlROMMap->timbreBOffset, 64)) {
return false;
}
printDebug("Initialising Timbre Bank R");
printDebug("Initializing Timbre Bank R");
if (!initRhythmTimbres(controlROMMap->timbreRMap, controlROMMap->timbreRCount)) {
return false;
}
printDebug("Initialising Timbre Bank M");
// CM-64 seems to initialise all bytes in this bank to 0.
printDebug("Initializing Timbre Bank M");
// CM-64 seems to initialize all bytes in this bank to 0.
memset(&mt32ram.timbres[128], 0, sizeof (mt32ram.timbres[128]) * 64);
partialManager = new PartialManager(this);
pcmWaves = new PCMWaveEntry[controlROMMap->pcmCount];
printDebug("Initialising PCM List");
printDebug("Initializing PCM List");
initPCMList(controlROMMap->pcmTable, controlROMMap->pcmCount);
printDebug("Initialising Rhythm Temp");
printDebug("Initializing Rhythm Temp");
memcpy(mt32ram.rhythmSettings, &controlROMData[controlROMMap->rhythmSettings], controlROMMap->rhythmSettingsCount * 4);
printDebug("Initialising Patches");
printDebug("Initializing Patches");
for (Bit8u i = 0; i < 128; i++) {
PatchParam *patch = &mt32ram.patches[i];
patch->timbreGroup = i / 64;
@ -468,9 +468,9 @@ bool Synth::open(SynthProperties &useProp) {
patch->dummy = 0;
}
printDebug("Initialising System");
printDebug("Initializing System");
// The MT-32 manual claims that "Standard pitch" is 442Hz.
mt32ram.system.masterTune = 0x40; // Confirmed on CM-64 as 0x4A, but SCUMM games use 0x40 and we don't want to initialise twice
mt32ram.system.masterTune = 0x40; // Confirmed on CM-64 as 0x4A, but SCUMM games use 0x40 and we don't want to initialize twice
mt32ram.system.reverbMode = 0; // Confirmed
mt32ram.system.reverbTime = 5; // Confirmed
mt32ram.system.reverbLevel = 3; // Confirmed
@ -792,7 +792,7 @@ void Synth::writeSysex(unsigned char device, const Bit8u *sysex, Bit32u len) {
for (;;) {
// Find the appropriate memory region
int regionNum;
const MemoryRegion *region = NULL; // Initialised to please compiler
const MemoryRegion *region = NULL; // Initialized to please compiler
for (regionNum = 0; regionNum < NUM_REGIONS; regionNum++) {
region = &memoryRegions[regionNum];
if (region->contains(addr)) {

2
audio/softsynth/mt32/synth.h
View file

@ -263,7 +263,7 @@ public:
Synth();
~Synth();
// Used to initialise the MT-32. Must be called before any other function.
// Used to initialize the MT-32. Must be called before any other function.
// Returns true if initialization was sucessful, otherwise returns false.
bool open(SynthProperties &useProp);

20
audio/softsynth/mt32/tables.cpp
View file

@ -203,7 +203,7 @@ void Tables::initEnvelopes(float samplerate) {
void Tables::initMT32ConstantTables(Synth *synth) {
int lf;
synth->printDebug("Initialising Pitch Tables");
synth->printDebug("Initializing Pitch Tables");
for (lf = -108; lf <= 108; lf++) {
tvfKeyfollowMult[lf + 108] = (int)(256 * powf(2.0f, (float)(lf / 24.0f)));
//synth->printDebug("KT %d = %d", f, keytable[f+108]);
@ -668,7 +668,7 @@ bool Tables::initNotes(Synth *synth, PCMWaveEntry *pcmWaves, float rate, float m
bool abort = false;
synth->report(ReportType_progressInit, &progress);
for (int f = LOWEST_NOTE; f <= HIGHEST_NOTE; f++) {
synth->printDebug("Initialising note %s%d", NoteNames[f % 12], (f / 12) - 2);
synth->printDebug("Initializing note %s%d", NoteNames[f % 12], (f / 12) - 2);
NoteLookup *noteLookup = &noteLookups[f - LOWEST_NOTE];
file = initNote(synth, noteLookup, (float)f, rate, masterTune, pcmWaves, file);
progress = (f - LOWEST_NOTE + 1) / (float)NUM_NOTES;
@ -723,12 +723,12 @@ void Tables::freeNotes() {
}
}
}
initialisedMasterTune = 0.0f;
initializedMasterTune = 0.0f;
}
Tables::Tables() {
initialisedSampleRate = 0.0f;
initialisedMasterTune = 0.0f;
initializedSampleRate = 0.0f;
initializedMasterTune = 0.0f;
memset(&noteLookups, 0, sizeof(noteLookups));
}
@ -737,23 +737,23 @@ bool Tables::init(Synth *synth, PCMWaveEntry *pcmWaves, float sampleRate, float
synth->printDebug("Bad sampleRate (%f <= 0.0f)", (double)sampleRate);
return false;
}
if (initialisedSampleRate == 0.0f) {
if (initializedSampleRate == 0.0f) {
initMT32ConstantTables(synth);
}
if (initialisedSampleRate != sampleRate) {
if (initializedSampleRate != sampleRate) {
initFiltCoeff(sampleRate);
initEnvelopes(sampleRate);
for (int key = 12; key <= 108; key++) {
initDep(&keyLookups[key - 12], (float)key);
}
}
if (initialisedSampleRate != sampleRate || initialisedMasterTune != masterTune) {
if (initializedSampleRate != sampleRate || initializedMasterTune != masterTune) {
freeNotes();
if (!initNotes(synth, pcmWaves, sampleRate, masterTune)) {
return false;
}
initialisedSampleRate = sampleRate;
initialisedMasterTune = masterTune;
initializedSampleRate = sampleRate;
initializedMasterTune = masterTune;
}
return true;
}

4
audio/softsynth/mt32/tables.h
View file

@ -69,8 +69,8 @@ struct KeyLookup {
};
class Tables {
float initialisedSampleRate;
float initialisedMasterTune;
float initializedSampleRate;
float initializedMasterTune;
void initMT32ConstantTables(Synth *synth);
static Bit16s clampWF(Synth *synth, const char *n, float ampVal, double input);
static File *initWave(Synth *synth, NoteLookup *noteLookup, float ampsize, float div2, File *file);

2
backends/audiocd/audiocd.h
View file

@ -108,7 +108,7 @@ public:
//@{
/**
* Initialise the specified CD drive for audio playback.
* Initialize the specified CD drive for audio playback.
* @param drive the drive id
* @return true if the CD drive was inited succesfully
*/

2
backends/midi/alsa.cpp
View file

@ -164,7 +164,7 @@ int MidiDriver_ALSA::open() {
}
printf("Connected to Alsa sequencer client [%d:%d]\n", seq_client, seq_port);
printf("ALSA client initialised [%d:0]\n", my_client);
printf("ALSA client initialized [%d:0]\n", my_client);
return 0;
}

2
backends/platform/android/gfx.cpp
View file

@ -179,7 +179,7 @@ void OSystem_Android::initSurface() {
JNI::initSurface();
// Initialise OpenGLES context.
// Initialize OpenGLES context.
GLESTexture::initGLExtensions();
if (_game_texture)

2
backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
View file

@ -260,7 +260,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
if (_audio_track.getState() != AudioTrack.STATE_INITIALIZED)
throw new Exception(
String.format("Error initialising AudioTrack: %d",
String.format("Error initializing AudioTrack: %d",
_audio_track.getState()));
}

2
backends/platform/dc/dc.h
View file

@ -53,7 +53,7 @@ class DCHardware {
};
class DCCDManager : public DefaultAudioCDManager {
// Initialise the specified CD drive for audio playback.
// Initialize the specified CD drive for audio playback.
bool openCD(int drive);
// Poll cdrom status

2
backends/platform/ds/arm9/source/fat/gba_nds_fat.c
View file

@ -1010,7 +1010,7 @@ DIR_ENT FAT_GetDirEntry ( u32 dirCluster, int entry, int origin)
dir.name[0] = FILE_FREE; // default to no file found
dir.attrib = 0x00;
// Check if fat has been initialised
// Check if fat has been initialized
if (filesysBytePerSec == 0)
{
return (dir);

2
backends/platform/gp2x/gp2x.cpp
View file

@ -125,7 +125,7 @@ void OSystem_GP2X::initBackend() {
ConfMan.setBool("FM_low_quality", true);
/* Initialise any GP2X specific stuff we may want (Batt Status, scaler etc.) */
/* Initialize any GP2X specific stuff we may want (Batt Status, scaler etc.) */
GP2X_HW::deviceInit();
/* Set Default hardware mixer volume to a preset level (VOLUME_INITIAL). This is done to 'reset' volume level if set by other apps. */

2
backends/platform/gph/gph-backend.cpp
View file

@ -141,7 +141,7 @@ void OSystem_GPH::initBackend() {
printf("%s\n", "Debug: STDOUT and STDERR redirected to text files.");
#endif /* DUMP_STDOUT */
/* Initialise any GP2X Wiz specific stuff we may want (Batt Status, scaler etc.) */
/* Initialize any GP2X Wiz specific stuff we may want (Batt Status, scaler etc.) */
WIZ_HW::deviceInit();
/* Set Default hardware mixer volume to a preset level (VOLUME_INITIAL). This is done to 'reset' volume level if set by other apps. */

6
backends/platform/wii/options.cpp
View file

@ -175,15 +175,15 @@ void WiiOptionsDialog::handleTickle() {
break;
case -EBUSY:
label = _("Initialising network");
label = _("Initializing network");
break;
case -ETIMEDOUT:
label = _("Timeout while initialising network");
label = _("Timeout while initializing network");
break;
default:
label = String::format(_("Network not initialised (%d)"), status);
label = String::format(_("Network not initialized (%d)"), status);
break;
}

2
common/events.h
View file

@ -306,7 +306,7 @@ public:
/**
* Initialise the event manager.
* Initialize the event manager.
* @note called after graphics system has been set up
*/
virtual void init() {}

2
common/system.h
View file

@ -1031,7 +1031,7 @@ public:
};
/** The global OSystem instance. Initialised in main(). */
/** The global OSystem instance. Initialized in main(). */
extern OSystem *g_system;
#endif

10
common/unzip.cpp
View file

@ -349,7 +349,7 @@ typedef struct {
z_stream stream; /* zLib stream structure for inflate */
uLong pos_in_zipfile; /* position in byte on the zipfile, for fseek*/
uLong stream_initialised; /* flag set if stream structure is initialised*/
uLong stream_initialized; /* flag set if stream structure is initialized*/
uLong offset_local_extrafield;/* offset of the local extra field */
uInt size_local_extrafield;/* size of the local extra field */
@ -1073,7 +1073,7 @@ int unzOpenCurrentFile (unzFile file) {
return UNZ_INTERNALERROR;
}
pfile_in_zip_read_info->stream_initialised=0;
pfile_in_zip_read_info->stream_initialized=0;
if ((s->cur_file_info.compression_method!=0) &&
(s->cur_file_info.compression_method!=Z_DEFLATED))
@ -1096,7 +1096,7 @@ int unzOpenCurrentFile (unzFile file) {
err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
if (err == Z_OK)
pfile_in_zip_read_info->stream_initialised = 1;
pfile_in_zip_read_info->stream_initialized = 1;
/* windowBits is passed < 0 to tell that there is no zlib header.
* Note that in this case inflate *requires* an extra "dummy" byte
* after the compressed stream in order to complete decompression and
@ -1365,7 +1365,7 @@ int unzCloseCurrentFile(unzFile file) {
if (pfile_in_zip_read_info->crc32_data != pfile_in_zip_read_info->crc32_wait)
err=UNZ_CRCERROR;
}
if (pfile_in_zip_read_info->stream_initialised)
if (pfile_in_zip_read_info->stream_initialized)
inflateEnd(&pfile_in_zip_read_info->stream);
#endif
@ -1373,7 +1373,7 @@ int unzCloseCurrentFile(unzFile file) {
free(pfile_in_zip_read_info->read_buffer);
pfile_in_zip_read_info->read_buffer = NULL;
pfile_in_zip_read_info->stream_initialised = 0;
pfile_in_zip_read_info->stream_initialized = 0;
free(pfile_in_zip_read_info);
s->pfile_in_zip_read=NULL;

14
devtools/create_hugo/create_hugo.h
View file

@ -144,7 +144,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
byte actType; // The type of action
int timer; // Time to set off the action
int objNumb; // The object number
@ -168,21 +168,21 @@ struct act4 { // Type 4 - Set new backgrou
long newBkgColor; // New color
};
struct act5 { // Type 5 - Initialise an object velocity
struct act5 { // Type 5 - Initialize an object velocity
byte actType; // The type of action
int timer; // Time to set off the action
int objNumb; // The object number
int vx, vy; // velocity
};
struct act6 { // Type 6 - Initialise an object carrying
struct act6 { // Type 6 - Initialize an object carrying
byte actType; // The type of action
int timer; // Time to set off the action
int objNumb; // 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
byte actType; // The type of action
int timer; // Time to set off the action
int objNumb; // The object number
@ -194,14 +194,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
byte actType; // The type of action
int timer; // Time to set off the action
int objNumb; // 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
byte actType; // The type of action
int timer; // Time to set off the action
int objNumb; // The object number
@ -290,7 +290,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
byte actType; // The type of action
int timer; // Time to set off the action
int objNumb; // The object number

2
devtools/create_hugo/enums.h
View file

@ -1376,7 +1376,7 @@ enum action_t { // Parameters:
INIT_MAZE = 30, // 30 - Start special maze hotspot processing
EXIT_MAZE = 31, // 31 - Exit special maze processing
INIT_PRIORITY = 32, // 32 - Initialize fbg field
INIT_SCREEN = 33, // 33 - Initialise screen field of object
INIT_SCREEN = 33, // 33 - Initialize screen field of object
AGSCHEDULE = 34, // 34 - Global schedule - lasts over new screen
REMAPPAL = 35, // 35 - Remappe palette - palette index, color
COND_NOUN = 36, // 36 - Conditional on noun appearing in line

6
devtools/create_mads/parser.cpp
View file

@ -237,10 +237,10 @@ void close_source_file() {
}
/**
* Initialises the scanner
* Initializes the scanner
*/
void init_scanner(const char *name) {
// Initialise character table
// Initialize character table
for (int i = 0; i < 256; ++i) char_table[i] = SPECIAL;
for (int i = '0'; i <= '9'; ++i) char_table[i] = DIGIT;
for (int i = 'A'; i <= 'Z'; ++i) char_table[i] = LETTER;
@ -265,7 +265,7 @@ void quit_scanner() {
/**
* Initialises the output
* Initializes the output
*/
void init_output(const char *destFilename) {
dest_file = fopen(destFilename, "wb");

2
engines/agos/string_pn.cpp
View file

@ -131,7 +131,7 @@ void AGOSEngine_PN::pcf(uint8 ch) {
if (ch == 255) {
_bp = 0;
_xofs = 0;
return; /* pcf(255) initialises the routine */
return; /* pcf(255) initializes the routine */
} /* pcf(254) flushes its working _buffer */
if (ch != 254) {
if ((ch != 32) || (_bp + _xofs != 50))

4
engines/cruise/cruise.cpp
View file

@ -92,7 +92,7 @@ Common::Error CruiseEngine::run() {
mainLoop();
deinitialise();
deinitialize();
return Common::kNoError;
}
@ -118,7 +118,7 @@ void CruiseEngine::initialize() {
_vm->_polyStruct = NULL;
}
void CruiseEngine::deinitialise() {
void CruiseEngine::deinitialize() {
_vm->_polyStructNorm.clear();
_vm->_polyStructExp.clear();

2
engines/cruise/cruise.h
View file

@ -69,7 +69,7 @@ private:
bool _speedFlag;
void initialize();
void deinitialise();
void deinitialize();
bool loadLanguageStrings();
bool makeLoad(char *saveName);
void mainLoop();

2
engines/draci/script.h
View file

@ -106,7 +106,7 @@ private:
int _jump;
bool _endProgram;
/** List of all GPL commands. Initialised in the constructor. */
/** List of all GPL commands. Initialized in the constructor. */
const GPL2Command *_commandList;
const GPL2Operator *_operatorList;
const GPL2Function *_functionList;

2
engines/hugo/hugo.cpp
View file

@ -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

2
engines/hugo/object_v1d.cpp
View file

@ -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

2
engines/hugo/object_v1w.cpp
View file

@ -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

2
engines/hugo/object_v2d.cpp
View file

@ -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

26
engines/hugo/schedule.cpp
View file

@ -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!

16
engines/hugo/schedule.h
View file

@ -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

2
engines/kyra/sound_adlib.cpp
View file

@ -1558,7 +1558,7 @@ int AdLibDriver::update_changeExtraLevel2(uint8 *&dataptr, Channel &channel, uin
return 0;
}
// Apart from initialising to zero, these two functions are the only ones that
// Apart from initializing to zero, these two functions are the only ones that
// modify _vibratoAndAMDepthBits.
int AdLibDriver::update_setAMDepth(uint8 *&dataptr, Channel &channel, uint8 value) {

12
engines/lure/lure.cpp
View file

@ -51,7 +51,7 @@ LureEngine::LureEngine(OSystem *system, const LureGameDescription *gameDesc)
Common::Error LureEngine::init() {
int_engine = this;
_initialised = false;
_initialized = false;
_saveLoadAllowed = false;
initGraphics(FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT, false);
@ -85,12 +85,12 @@ Common::Error LureEngine::init() {
_mouse = new Mouse();
_events = new Events();
_menu = new Menu();
Surface::initialise();
Surface::initialize();
_room = new Room();
_fights = new FightsManager();
_gameToLoad = -1;
_initialised = true;
_initialized = true;
// Setup mixer
syncSoundSettings();
@ -102,9 +102,9 @@ LureEngine::~LureEngine() {
// Remove all of our debug levels here
DebugMan.clearAllDebugChannels();
if (_initialised) {
// Delete and deinitialise subsystems
Surface::deinitialise();
if (_initialized) {
// Delete and deinitialize subsystems
Surface::deinitialize();
Sound.destroy();
delete _fights;
delete _room;

2
engines/lure/lure.h
View file

@ -65,7 +65,7 @@ struct LureGameDescription;
class LureEngine : public Engine {
private:
bool _initialised;
bool _initialized;
int _gameToLoad;
uint8 _saveVersion;
Disk *_disk;

2
engines/lure/res.cpp
View file

@ -345,7 +345,7 @@ void Resources::reloadData() {
}
delete mb;
// Initialise delay list
// Initialize delay list
_delayList.clear(true);
// Load miscellaneous data

2
engines/lure/res_struct.cpp
View file

@ -415,7 +415,7 @@ HotspotData::HotspotData(HotspotResource *rec) {
flags2 = READ_LE_UINT16(&rec->flags2);
headerFlags = READ_LE_UINT16(&rec->hdrFlags);
// Initialise runtime fields
// Initialize runtime fields
actionCtr = 0;
blockedState = BS_NONE;
blockedFlag = false;

2
engines/lure/sound.h
View file

@ -153,7 +153,7 @@ public:
uint sfxVolume() const { return _sfxVolume; }
// The following methods implement the external sound player module
void musicInterface_Initialise();
void musicInterface_Initialize();
void musicInterface_Play(uint8 soundNumber, uint8 channelNumber, uint8 numChannels = 4);
void musicInterface_Stop(uint8 soundNumber);
bool musicInterface_CheckPlaying(uint8 soundNumber);

8
engines/lure/surface.cpp
View file

@ -33,8 +33,8 @@
namespace Lure {
// These variables hold resources commonly used by the Surfaces, and must be initialised and freed
// by the static Surface methods initialise and deinitailse
// These variables hold resources commonly used by the Surfaces, and must be initialized and freed
// by the static Surface methods initialize and deinitailse
static MemoryBlock *int_font = NULL;
static MemoryBlock *int_dialog_frame = NULL;
@ -45,7 +45,7 @@ static const byte char8A[8] = {0x40, 0x20, 0x00, 0x90, 0x90, 0x90, 0x68, 0x00};
static const byte char8D[8] = {0x80, 0x40, 0x00, 0xc0, 0x40, 0x40, 0x60, 0x00}; // accented `i
static const byte char95[8] = {0x40, 0x20, 0x00, 0x60, 0x90, 0x90, 0x60, 0x00}; // accented `o
void Surface::initialise() {
void Surface::initialize() {
Disk &disk = Disk::getReference();
int_font = disk.getEntry(FONT_RESOURCE_ID);
int_dialog_frame = disk.getEntry(DIALOG_RESOURCE_ID);
@ -80,7 +80,7 @@ void Surface::initialise() {
}
}
void Surface::deinitialise() {
void Surface::deinitialize() {
delete int_font;
delete int_dialog_frame;
}

4
engines/lure/surface.h
View file

@ -49,8 +49,8 @@ public:
static void getDialogBounds(Common::Point &size, int charWidth, int numLines,
bool squashedLines = true);
static void initialise();
static void deinitialise();
static void initialize();
static void deinitialize();
uint16 width() { return _width; }
uint16 height() { return _height; }

12
engines/m4/animation.cpp
View file

@ -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;
}

2
engines/m4/animation.h
View file

@ -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);

8
engines/m4/compression.cpp
View file

@ -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;

2
engines/m4/compression.h
View file

@ -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);

2
engines/m4/gui.h
View file

@ -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) {}
};

2
engines/m4/m4.cpp
View file

@ -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);

2
engines/m4/m4.h
View file

@ -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);

2
engines/m4/mads_anim.cpp
View file

@ -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);

6
engines/m4/mads_logic.cpp
View file

@ -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");

4
engines/m4/mads_logic.h
View file

@ -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();
};
}

10
engines/m4/mads_menus.cpp
View file

@ -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);

4
engines/m4/mads_menus.h
View file

@ -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:

12
engines/m4/mads_scene.cpp
View file

@ -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();

6
engines/m4/mads_scene.h
View file

@ -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; }

2
engines/m4/mads_views.h
View file

@ -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;

2
engines/queen/command.h
View file

@ -97,7 +97,7 @@ public:
Command(QueenEngine *vm);
~Command();
//! initialise command construction
//! initialize command construction
void clear(bool clearTexts);
//! execute last constructed command

4
engines/queen/display.h
View file

@ -44,7 +44,7 @@ public:
Display(QueenEngine *vm, OSystem *system);
~Display();
//! initialise dynalum for the specified room
//! initialize dynalum for the specified room
void dynalumInit(const char *roomName, uint16 roomNum);
//! update dynalum for the current room
@ -138,7 +138,7 @@ public:
//! show/hide mouse cursor
void showMouseCursor(bool show);
//! initialise font, compute justification sizes
//! initialize font, compute justification sizes
void initFont();
//! add the specified text to the texts list

18
engines/sci/engine/script.cpp
View file

@ -492,7 +492,7 @@ SegmentRef Script::dereference(reg_t pointer) {
return ret;
}
void Script::initialiseLocals(SegManager *segMan) {
void Script::initializeLocals(SegManager *segMan) {
LocalVariables *locals = segMan->allocLocalsSegment(this);
if (locals) {
if (getSciVersion() > SCI_VERSION_0_EARLY) {
@ -508,7 +508,7 @@ void Script::initialiseLocals(SegManager *segMan) {
}
}
void Script::initialiseClasses(SegManager *segMan) {
void Script::initializeClasses(SegManager *segMan) {
const byte *seeker = 0;
uint16 mult = 0;
@ -580,7 +580,7 @@ void Script::initialiseClasses(SegManager *segMan) {
}
}
void Script::initialiseObjectsSci0(SegManager *segMan, SegmentId segmentId) {
void Script::initializeObjectsSci0(SegManager *segMan, SegmentId segmentId) {
bool oldScriptHeader = (getSciVersion() == SCI_VERSION_0_EARLY);
// We need to make two passes, as the objects in the script might be in the
@ -632,7 +632,7 @@ void Script::initialiseObjectsSci0(SegManager *segMan, SegmentId segmentId) {
relocateSci0Sci21(make_reg(segmentId, relocationBlock - getBuf() + 4));
}
void Script::initialiseObjectsSci11(SegManager *segMan, SegmentId segmentId) {
void Script::initializeObjectsSci11(SegManager *segMan, SegmentId segmentId) {
const byte *seeker = _heapStart + 4 + READ_SCI11ENDIAN_UINT16(_heapStart + 2) * 2;
while (READ_SCI11ENDIAN_UINT16(seeker) == SCRIPT_OBJECT_MAGIC_NUMBER) {
@ -667,7 +667,7 @@ void Script::initialiseObjectsSci11(SegManager *segMan, SegmentId segmentId) {
relocateSci0Sci21(make_reg(segmentId, READ_SCI11ENDIAN_UINT16(_heapStart)));
}
void Script::initialiseObjectsSci3(SegManager *segMan, SegmentId segmentId) {
void Script::initializeObjectsSci3(SegManager *segMan, SegmentId segmentId) {
const byte *seeker = getSci3ObjectsPointer();
while (READ_SCI11ENDIAN_UINT16(seeker) == SCRIPT_OBJECT_MAGIC_NUMBER) {
@ -681,13 +681,13 @@ void Script::initialiseObjectsSci3(SegManager *segMan, SegmentId segmentId) {
relocateSci3(make_reg(segmentId, 0));
}
void Script::initialiseObjects(SegManager *segMan, SegmentId segmentId) {
void Script::initializeObjects(SegManager *segMan, SegmentId segmentId) {
if (getSciVersion() <= SCI_VERSION_1_LATE)
initialiseObjectsSci0(segMan, segmentId);
initializeObjectsSci0(segMan, segmentId);
else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1)
initialiseObjectsSci11(segMan, segmentId);
initializeObjectsSci11(segMan, segmentId);
else if (getSciVersion() == SCI_VERSION_3)
initialiseObjectsSci3(segMan, segmentId);
initializeObjectsSci3(segMan, segmentId);
}
reg_t Script::findCanonicAddress(SegManager *segMan, reg_t addr) const {

12
engines/sci/engine/script.h
View file

@ -137,20 +137,20 @@ public:
* Initializes the script's local variables
* @param segMan A reference to the segment manager
*/
void initialiseLocals(SegManager *segMan);
void initializeLocals(SegManager *segMan);
/**
* Adds the script's classes to the segment manager's class table
* @param segMan A reference to the segment manager
*/
void initialiseClasses(SegManager *segMan);
void initializeClasses(SegManager *segMan);
/**
* Initializes the script's objects (SCI0)
* @param segMan A reference to the segment manager
* @param segmentId The script's segment id
*/
void initialiseObjects(SegManager *segMan, SegmentId segmentId);
void initializeObjects(SegManager *segMan, SegmentId segmentId);
// script lock operations
@ -280,21 +280,21 @@ private:
* @param segMan A reference to the segment manager
* @param segmentId The script's segment id
*/
void initialiseObjectsSci0(SegManager *segMan, SegmentId segmentId);
void initializeObjectsSci0(SegManager *segMan, SegmentId segmentId);
/**
* Initializes the script's objects (SCI1.1 - SCI2.1)
* @param segMan A reference to the segment manager
* @param segmentId The script's segment id
*/
void initialiseObjectsSci11(SegManager *segMan, SegmentId segmentId);
void initializeObjectsSci11(SegManager *segMan, SegmentId segmentId);
/**
* Initializes the script's objects (SCI3)
* @param segMan A reference to the segment manager
* @param segmentId The script's segment id
*/
void initialiseObjectsSci3(SegManager *segMan, SegmentId segmentId);
void initializeObjectsSci3(SegManager *segMan, SegmentId segmentId);
};
} // End of namespace Sci

6
engines/sci/engine/seg_manager.cpp
View file

@ -1007,9 +1007,9 @@ int SegManager::instantiateScript(int scriptNum) {
scr->init(scriptNum, _resMan);
scr->load(_resMan);
scr->initialiseLocals(this);
scr->initialiseClasses(this);
scr->initialiseObjects(this, segmentId);
scr->initializeLocals(this);
scr->initializeClasses(this);
scr->initializeObjects(this, segmentId);
return segmentId;
}

2
engines/sci/engine/seg_manager.h
View file

@ -71,7 +71,7 @@ public:
*/
Script *allocateScript(int script_nr, SegmentId *seg_id);
// The script must then be initialised; see section (1b.), below.
// The script must then be initialized; see section (1b.), below.
/**
* Forcefully deallocate a previously allocated script.

2
engines/scumm/boxes.cpp
View file

@ -962,7 +962,7 @@ void ScummEngine::calcItineraryMatrix(byte *itineraryMatrix, int num) {
// Allocate the adjacent & itinerary matrices
adjacentMatrix = (byte *)malloc(boxSize * boxSize);
// Initialise the adjacent matrix: each box has distance 0 to itself,
// Initialize the adjacent matrix: each box has distance 0 to itself,
// and distance 1 to its direct neighbors. Initially, it has distance
// 255 (= infinity) to all other boxes.
for (i = 0; i < num; i++) {

2
engines/scumm/palette.cpp
View file

@ -214,7 +214,7 @@ void ScummEngine::resetPalette() {
} else {
if ((_game.platform == Common::kPlatformAmiga) && _game.version == 4) {
// if rendermode is set to EGA we use the full palette from the resources
// else we initialise and then lock down the first 16 colors.
// else we initialize and then lock down the first 16 colors.
if (_renderMode != Common::kRenderEGA)
setPaletteFromTable(tableAmigaMIPalette, sizeof(tableAmigaMIPalette) / 3);
#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE

2
engines/scumm/player_v4a.h
View file

@ -67,7 +67,7 @@ private:
// byte type;
} _sfxSlots[4];
int8 _initState; // < 0: failed, 0: uninitialised, > 0: initialised
int8 _initState; // < 0: failed, 0: uninitialized, > 0: initialized
int getSfxChan(int id) const {
for (int i = 0; i < ARRAYSIZE(_sfxSlots); ++i)

4
engines/sky/logic.cpp
View file

@ -1890,7 +1890,7 @@ bool Logic::fnCheckRequest(uint32 a, uint32 b, uint32 c) {
}
bool Logic::fnStartMenu(uint32 firstObject, uint32 b, uint32 c) {
/// initialise the top menu bar
/// initialize the top menu bar
// firstObject is o0 for game menu, k0 for linc
uint i;
@ -1939,7 +1939,7 @@ bool Logic::fnStartMenu(uint32 firstObject, uint32 b, uint32 c) {
else if (menuLength < _scriptVariables[SCROLL_OFFSET] + 11)
_scriptVariables[SCROLL_OFFSET] = menuLength - 11;
// (6) AND FINALLY, INITIALISE THE 11 OBJECTS SO THEY APPEAR ON SCREEEN
// (6) AND FINALLY, INITIALIZE THE 11 OBJECTS SO THEY APPEAR ON SCREEEN
uint16 rollingX = TOP_LEFT_X + 28;
for (i = 0; i < 11; i++) {

6
engines/sword2/console.cpp
View file

@ -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;
}

2
engines/sword2/icons.cpp
View file

@ -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;

4
engines/sword2/interpreter.cpp
View file

@ -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--) {

26
engines/sword2/layers.cpp
View file

@ -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);

12
engines/sword2/maketext.cpp
View file

@ -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;

18
engines/sword2/render.cpp
View file

@ -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);

2
engines/sword2/router.h
View file

@ -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)

14
engines/sword2/screen.cpp
View file

@ -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);

8
engines/sword2/screen.h
View file

@ -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);

4
engines/sword2/sword2.cpp
View file

@ -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();

4
engines/sword2/sword2.h
View file

@ -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);

2
engines/sword25/gfx/graphicengine.h
View file

@ -106,7 +106,7 @@ public:
// ---------
/**
* Initialises the graphics engine and sets the screen mode. Returns
* Initializes the graphics engine and sets the screen mode. Returns
* true if initialisation failed.
* @note This method should be called immediately after the
* initialisation of all services.

4
engines/sword25/gfx/panel.cpp
View file

@ -47,12 +47,12 @@ Panel::Panel(RenderObjectPtr<RenderObject> parentPtr, int width, int height, uin
_height = height;
if (_width < 0) {
error("Tried to initialise a panel with an invalid width (%d).", _width);
error("Tried to initialize a panel with an invalid width (%d).", _width);
return;
}
if (_height < 0) {
error("Tried to initialise a panel with an invalid height (%d).", _height);
error("Tried to initialize a panel with an invalid height (%d).", _height);
return;
}

2
engines/sword25/input/inputengine.h
View file

@ -172,7 +172,7 @@ public:
/// --------------------------------------------------------------
/**
* Initialises the input engine
* Initializes the input engine
* @return Returns a true on success, otherwise false.
*/
bool init();

2
engines/sword25/kernel/kernel.cpp
View file

@ -63,7 +63,7 @@ Kernel::Kernel() :
// Create the resource manager
_resourceManager = new ResourceManager(this);
// Initialise the script engine
// Initialize the script engine
_script = new LuaScriptEngine(this);
if (!_script || !_script->init()) {
_initSuccess = false;

2
engines/sword25/kernel/kernel.h
View file

@ -79,7 +79,7 @@ public:
uint getMilliTicks();
/**
* Specifies whether the kernel was successfully initialised
* Specifies whether the kernel was successfully initialized
*/
bool getInitSuccess() const {
return _initSuccess;

2
engines/sword25/math/polygon.cpp
View file

@ -59,7 +59,7 @@ Polygon::~Polygon() {
}
bool Polygon::init(int vertexCount_, const Vertex *vertices_) {
// Rember the old obstate to restore it if an error occurs whilst initialising it with the new data
// Rember the old obstate to restore it if an error occurs whilst initializing it with the new data
int oldvertexCount = this->vertexCount;
Vertex *oldvertices = this->vertices;

6
engines/sword25/math/polygon.h
View file

@ -78,15 +78,15 @@ public:
virtual ~Polygon();
/**
* Initialises the BS_Polygon with a list of Vertecies.
* Initializes the BS_Polygon with a list of Vertecies.
*
* The Vertices need to define a polygon must not have self-intersections.
* If a polygon already has verticies, this will re-initialise it with the new list.
* If a polygon already has verticies, this will re-initialize it with the new list.
*
* @param VertexCount The number of vertices being passed
* @param Vertecies An array of BS_Vertex objects representing the vertices in the polygon.
* @return Returns false if the Vertecies have self-intersections. In this case,
* the object is not initialised.
* the object is not initialized.
*/
bool init(int vertexCount_, const Vertex *vertices_);

2
engines/sword25/math/region.cpp
View file

@ -115,7 +115,7 @@ bool Region::init(const Polygon &contour, const Common::Array<Polygon> *pHoles)
}
// Initialise bounding box
// Initialize bounding box
updateBoundingBox();
_valid = true;

4
engines/sword25/math/region.h
View file

@ -73,12 +73,12 @@ public:
virtual ~Region();
/**
* Initialises a BS_Region object
* Initializes a BS_Region object
* @param Contour A polygon indicating the outline of the region
* @param pHoles A pointer to an array of polygons representing the hole state in the region.
* If the region has no holes, it must be passed as NULL. The default value is NULL.
* @return Returns true if the initialisation was successful, otherwise false.
* @remark If the region was already initialised, the old state will be deleted.
* @remark If the region was already initialized, the old state will be deleted.
*/
virtual bool init(const Polygon &contour, const Common::Array<Polygon> *pHoles = NULL);

6
engines/sword25/math/walkregion.cpp
View file

@ -101,7 +101,7 @@ static void initDijkstraNodes(DijkstraNode::Container &dijkstraNodes, const Regi
// Allocate sufficient space in the array
dijkstraNodes.resize(nodes.size());
// Initialise all the nodes which are visible from the starting node
// Initialize all the nodes which are visible from the starting node
DijkstraNode::Iter dijkstraIter = dijkstraNodes.begin();
for (Common::Array<Vertex>::const_iterator nodesIter = nodes.begin();
nodesIter != nodes.end(); nodesIter++, dijkstraIter++) {
@ -173,7 +173,7 @@ void reverseArray(Common::Array<T> &arr) {
bool WalkRegion::findPath(const Vertex &start, const Vertex &end, BS_Path &path) const {
// This is an implementation of Dijkstra's algorithm
// Initialise edge node list
// Initialize edge node list
DijkstraNode::Container dijkstraNodes;
initDijkstraNodes(dijkstraNodes, *this, start, _nodes);
@ -247,7 +247,7 @@ void WalkRegion::initNodeVector() {
}
void WalkRegion::computeVisibilityMatrix() {
// Initialise visibility matrix
// Initialize visibility matrix
_visibilityMatrix = Common::Array< Common::Array <int> >();
for (uint idx = 0; idx < _nodes.size(); ++idx) {
Common::Array<int> arr;

2
engines/sword25/script/luascript.cpp
View file

@ -112,7 +112,7 @@ bool LuaScriptEngine::init() {
// Place the error handler function in the Lua registry, and remember the index
_pcallErrorhandlerRegistryIndex = luaL_ref(_state, LUA_REGISTRYINDEX);
// Initialise the Pluto-Persistence library
// Initialize the Pluto-Persistence library
luaopen_pluto(_state);
lua_pop(_state, 1);

2
engines/sword25/script/luascript.h
View file

@ -49,7 +49,7 @@ public:
virtual ~LuaScriptEngine();
/**
* Initialises the scripting engine
* Initializes the scripting engine
* @return Returns true if successful, otherwise false.
*/
virtual bool init();

2
engines/sword25/script/script.h
View file

@ -54,7 +54,7 @@ public:
// -----------------------------------------------------------------------------
/**
* Initialises the scrip tengine. Returns true if successful, false otherwise.
* Initializes the scrip tengine. Returns true if successful, false otherwise.
*/
virtual bool init() = 0;

2
engines/sword25/sfx/soundengine.h
View file

@ -88,7 +88,7 @@ public:
~SoundEngine() {}
/**
* Initialises the sound engine
* Initializes the sound engine
* @param SampleRate Specifies the sample rate to use.
* @param Channels The maximum number of channels. The default is 32.
* @return Returns true on success, otherwise false.

4
engines/sword25/sword25.cpp
View file

@ -94,7 +94,7 @@ Common::Error Sword25Engine::run() {
}
Common::Error Sword25Engine::appStart() {
// Initialise the graphics mode to ARGB8888
// Initialize the graphics mode to ARGB8888
Graphics::PixelFormat format = Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24);
initGraphics(800, 600, true, &format);
if (format != g_system->getScreenFormat())
@ -142,7 +142,7 @@ bool Sword25Engine::appMain() {
}
bool Sword25Engine::appEnd() {
// The kernel is shutdown, and un-initialises all subsystems
// The kernel is shutdown, and un-initializes all subsystems
Kernel::deleteInstance();
AnimationTemplateRegistry::destroy();

2
engines/tinsel/actors.cpp
View file

@ -434,7 +434,7 @@ void StartTaggedActors(SCNHANDLE ah, int numActors, bool bRunScript) {
memset(taggedActors, 0, sizeof(taggedActors));
numTaggedActors = numActors;
} else {
// Only actors with code blocks got (x, y) re-initialised, so...
// Only actors with code blocks got (x, y) re-initialized, so...
for (i = 0; i < NumActors; i++) {
actorInfo[i].x = actorInfo[i].y = 0;
actorInfo[i].mtype = 0;

2
engines/tinsel/background.cpp
View file

@ -37,7 +37,7 @@ namespace Tinsel {
const BACKGND *pCurBgnd = NULL;
/**
* Called to initialise a background.
* Called to initialize a background.
* @param pBgnd Pointer to data struct for current background
*/

2
engines/tinsel/background.h
View file

@ -73,7 +73,7 @@ struct BACKGND {
|* Background Function Prototypes *|
\*----------------------------------------------------------------------*/
void InitBackground( // called to initialise a background
void InitBackground( // called to initialize a background
const BACKGND *pBgnd); // pointer to data struct for current background
void StartupBackground(CORO_PARAM, SCNHANDLE hFilm);

8
engines/tinsel/bg.cpp
View file

@ -126,7 +126,7 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
// Get the MULTI_INIT structure
pmi = (const MULTI_INIT *)LockMem(FROM_LE_32(pReel->mobj));
// Initialise and insert the object, and initialise its script.
// Initialize and insert the object, and initialize its script.
pBG[0] = MultiInitObject(pmi);
MultiInsertObject(GetPlayfieldList(FIELD_WORLD), pBG[0]);
InitStepAnimScript(&thisAnim[0], pBG[0], FROM_LE_32(pReel->script), BGspeed);
@ -141,7 +141,7 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
// Get the MULTI_INIT structure
pmi = (PMULTI_INIT) LockMem(FROM_LE_32(pFilm->reels[i].mobj));
// Initialise and insert the object, and initialise its script.
// Initialize and insert the object, and initialize its script.
pBG[i] = MultiInitObject(pmi);
MultiInsertObject(GetPlayfieldList(FIELD_WORLD), pBG[i]);
MultiSetZPosition(pBG[i], 0);
@ -176,7 +176,7 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
pFilm = (const FILM *)LockMem(hBackground);
assert(bgReels == (int32)FROM_LE_32(pFilm->numreels));
// Just re-initialise the scripts.
// Just re-initialize the scripts.
for (int i = 0; i < bgReels; i++) {
InitStepAnimScript(&thisAnim[i], pBG[i], pFilm->reels[i].script, BGspeed);
StepAnimScript(&thisAnim[i]);
@ -202,7 +202,7 @@ static void BGotherProcess(CORO_PARAM, const void *param) {
CORO_BEGIN_CODE(_ctx);
// Initialise and insert the object, and initialise its script.
// Initialize and insert the object, and initialize its script.
_ctx->pObj = MultiInitObject(pmi);
MultiInsertObject(GetPlayfieldList(FIELD_WORLD), _ctx->pObj);

12
engines/tinsel/bmv.cpp
View file

@ -385,7 +385,7 @@ void BMVPlayer::MoviePalette(int paletteOffset) {
SetTextPal(talkColor);
}
void BMVPlayer::InitialiseMovieSound() {
void BMVPlayer::InitializeMovieSound() {
_audioStream = Audio::makeQueuingAudioStream(22050, true);
audioStarted = false;
}
@ -663,7 +663,7 @@ void BMVPlayer::LoadSlots(int number) {
/**
* Called from the foreground when starting playback of a movie.
*/
void BMVPlayer::InitialiseBMV() {
void BMVPlayer::InitializeBMV() {
if (!stream.open(szMovieFile))
error(CANNOT_FIND_FILE, szMovieFile);
@ -680,7 +680,7 @@ void BMVPlayer::InitialiseBMV() {
// Pass the sceen buffer to the decompresser
InitBMV(screenBuffer);
// Initialise some stuff
// Initialize some stuff
nextUseOffset = 0;
nextSoundOffset = 0;
wrapUseOffset = -1;
@ -705,8 +705,8 @@ void BMVPlayer::InitialiseBMV() {
while (numAdvancePackets < ADVANCE_SOUND)
LoadSlots(1);
// Initialise the sound channel
InitialiseMovieSound();
// Initialize the sound channel
InitializeMovieSound();
}
/**
@ -1066,7 +1066,7 @@ void BMVPlayer::FettleBMV() {
// First time in with this movie
InitialiseBMV();
InitializeBMV();
for (i = 0; i < ADVANCE_SOUND;) {
if (DoSoundFrame())

4
engines/tinsel/bmv.h
View file

@ -134,7 +134,7 @@ private:
void InitBMV(byte *memoryBuffer);
void PrepAudio(const byte *sourceData, int blobCount, byte *destPtr);
void MoviePalette(int paletteOffset);
void InitialiseMovieSound();
void InitializeMovieSound();
void StartMovieSound();
void FinishMovieSound();
void MovieAudio(int audioOffset, int blobs);
@ -144,7 +144,7 @@ private:
int MovieCommand(char cmd, int commandOffset);
int FollowingPacket(int thisPacket, bool bReallyImportant);
void LoadSlots(int number);
void InitialiseBMV();
void InitializeBMV();
bool MaintainBuffer();
bool DoBMVFrame();
bool DoSoundFrame();

2
engines/tinsel/cliprect.cpp
View file

@ -209,7 +209,7 @@ void UpdateClipRect(OBJECT **pObjList, Common::Point *pWin, Common::Rect *pClip)
DRAWOBJECT currentObj; // filled in to draw the current object in list
OBJECT *pObj; // object list iterator
// Initialise the fields of the drawing object to empty
// Initialize the fields of the drawing object to empty
memset(&currentObj, 0, sizeof(DRAWOBJECT));
for (pObj = *pObjList; pObj != NULL; pObj = pObj->pNext) {

24
engines/tinsel/cursor.cpp
View file

@ -77,7 +77,7 @@ static int nextTrail = 0;
static bool bWhoa = false; // Set by DropCursor() at the end of a scene
// - causes cursor processes to do nothing
// Reset when main cursor has re-initialised
// Reset when main cursor has re-initialized
static uint16 restart = 0; // When main cursor has been bWhoa-ed, it waits
// for this to be set to 0x8000.
@ -106,8 +106,8 @@ static int lastCursorX = 0, lastCursorY = 0;
static void DoCursorMove();
/**
* Initialise and insert a cursor trail object, set its Z-pos, and hide
* it. Also initialise its animation script.
* Initialize and insert a cursor trail object, set its Z-pos, and hide
* it. Also initialize its animation script.
*/
static void InitCurTrailObj(int i, int x, int y) {
const FREEL *pfr; // pointer to reel
@ -127,13 +127,13 @@ static void InitCurTrailObj(int i, int x, int y) {
assert(BgPal()); // No background palette
pim->hImgPal = TO_LE_32(BgPal());
// Initialise and insert the object, set its Z-pos, and hide it
// Initialize and insert the object, set its Z-pos, and hide it
ntrailData[i].trailObj = MultiInitObject(pmi);
MultiInsertObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
MultiSetZPosition(ntrailData[i].trailObj, Z_CURSORTRAIL);
MultiSetAniXY(ntrailData[i].trailObj, x, y);
// Initialise the animation script
// Initialize the animation script
InitStepAnimScript(&ntrailData[i].trailAnim, ntrailData[i].trailObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
StepAnimScript(&ntrailData[i].trailAnim);
}
@ -227,7 +227,7 @@ void GetCursorXY(int *x, int *y, bool absolute) {
}
/**
* Re-initialise the main cursor to use the main cursor reel.
* Re-initialize the main cursor to use the main cursor reel.
* Called from TINLIB.C to restore cursor after hiding it.
* Called from INVENTRY.C to restore cursor after customising it.
*/
@ -385,11 +385,11 @@ void SetAuxCursor(SCNHANDLE hFilm) {
ACoY = (short)((FROM_LE_16(pim->imgHeight) & ~C16_FLAG_MASK)/2 -
((int16) FROM_LE_16(pim->anioffY)));
// Initialise and insert the auxillary cursor object
// Initialize and insert the auxillary cursor object
AcurObj = MultiInitObject(pmi);
MultiInsertObject(GetPlayfieldList(FIELD_STATUS), AcurObj);
// Initialise the animation and set its position
// Initialize the animation and set its position
InitStepAnimScript(&AcurAnim, AcurObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
MultiSetAniXY(AcurObj, x - ACoX, y - ACoY);
MultiSetZPosition(AcurObj, Z_ACURSOR);
@ -470,7 +470,7 @@ static void DoCursorMove() {
}
/**
* Initialise cursor object.
* Initialize cursor object.
*/
static void InitCurObj() {
const FILM *pFilm;
@ -500,7 +500,7 @@ static void InitCurObj() {
}
/**
* Initialise the cursor position.
* Initialize the cursor position.
*/
static void InitCurPos() {
Common::Point ptMouse = _vm->getMousePosition();
@ -530,7 +530,7 @@ static void CursorStoppedCheck(CORO_PARAM) {
while (restart != 0x8000)
CORO_SLEEP(1);
// Re-initialise
// Re-initialize
InitCurObj();
InitCurPos();
InventoryIconCursor(false); // May be holding something
@ -656,7 +656,7 @@ void DropCursor() {
* RestartCursor is called when a new scene is starting up.
*/
void RestartCursor() {
restart = 0x8000; // Get the main cursor to re-initialise
restart = 0x8000; // Get the main cursor to re-initialize
}
/**

Some files were not shown because too many files have changed in this diff Show more