aboutsummaryrefslogtreecommitdiff
path: root/engines/lure
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lure')
-rw-r--r--engines/lure/debugger.cpp2
-rw-r--r--engines/lure/decode.cpp10
-rw-r--r--engines/lure/detection.cpp7
-rw-r--r--engines/lure/lure.cpp12
-rw-r--r--engines/lure/lure.h4
-rw-r--r--engines/lure/res.cpp2
-rw-r--r--engines/lure/res_struct.cpp2
-rw-r--r--engines/lure/sound.h2
-rw-r--r--engines/lure/surface.cpp8
-rw-r--r--engines/lure/surface.h4
10 files changed, 25 insertions, 28 deletions
diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp
index 9d54bccb49..68410875f7 100644
--- a/engines/lure/debugger.cpp
+++ b/engines/lure/debugger.cpp
@@ -534,7 +534,7 @@ bool Debugger::cmd_showAnim(int argc, const char **argv) {
}
// Bottle object is used as a handy hotspot holder that doesn't have any
- // tick proc behaviour that we need to worry about
+ // tick proc behavior that we need to worry about
Hotspot *hotspot = res.activateHotspot(BOTTLE_HOTSPOT_ID);
hotspot->setLayer(0xfe);
hotspot->setSize(width, height);
diff --git a/engines/lure/decode.cpp b/engines/lure/decode.cpp
index 3e139a10d6..59390e6e91 100644
--- a/engines/lure/decode.cpp
+++ b/engines/lure/decode.cpp
@@ -131,7 +131,7 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) {
READ_BIT_DX
if (!bitFlag) {
- // Get the favourite color
+ // Get the favorite color
v = popTable[tableOffset];
} else {
@@ -143,7 +143,7 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) {
READ_BIT_DX
if (bitFlag) {
- // We have no favourite. Could this be a repeat?
+ // We have no favorite. Could this be a repeat?
al = dx >> 11;
READ_BITS(5);
@@ -184,7 +184,7 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) {
}
} else {
- // Fourth favourite
+ // Fourth favorite
v = popTable[tableOffset + 96];
}
@@ -193,10 +193,10 @@ MemoryBlock *PictureDecoder::egaDecode(MemoryBlock *src, uint32 maxOutputSize) {
READ_BIT_DX
if (bitFlag) {
- // Third favourite
+ // Third favorite
v = popTable[tableOffset + 64];
} else {
- // Second favourite
+ // Second favorite
v = popTable[tableOffset + 32];
}
}
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index a69300ee2f..ced0be0cfb 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -205,7 +205,7 @@ public:
LureMetaEngine() : AdvancedMetaEngine(detectionParams) {}
virtual const char *getName() const {
- return "Lure of the Temptress";
+ return "Lure";
}
virtual const char *getOriginalCopyright() const {
@@ -271,11 +271,8 @@ SaveStateList LureMetaEngine::listSaves(const char *target) const {
int LureMetaEngine::getMaximumSaveSlot() const { return 999; }
void LureMetaEngine::removeSaveState(const char *target, int slot) const {
- char extension[6];
- snprintf(extension, sizeof(extension), ".%03d", slot);
-
Common::String filename = target;
- filename += extension;
+ filename += Common::String::format(".%03d", slot);
g_system->getSavefileManager()->removeSavefile(filename);
}
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index c6be5c48fe..3217cf039d 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -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;
diff --git a/engines/lure/lure.h b/engines/lure/lure.h
index 53fdb8c713..34bb9f1639 100644
--- a/engines/lure/lure.h
+++ b/engines/lure/lure.h
@@ -65,7 +65,7 @@ struct LureGameDescription;
class LureEngine : public Engine {
private:
- bool _initialised;
+ bool _initialized;
int _gameToLoad;
uint8 _saveVersion;
Disk *_disk;
@@ -123,7 +123,7 @@ public:
virtual Common::Error loadGameState(int slot) {
return loadGame(slot) ? Common::kReadingFailed : Common::kNoError;
}
- virtual Common::Error saveGameState(int slot, const char *desc) {
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) {
Common::String s(desc);
return saveGame(slot, s) ? Common::kReadingFailed : Common::kNoError;
}
diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp
index 31c4efa2aa..fbf9f33b87 100644
--- a/engines/lure/res.cpp
+++ b/engines/lure/res.cpp
@@ -345,7 +345,7 @@ void Resources::reloadData() {
}
delete mb;
- // Initialise delay list
+ // Initialize delay list
_delayList.clear(true);
// Load miscellaneous data
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index 0d9d75b00b..222f55b5dc 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -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;
diff --git a/engines/lure/sound.h b/engines/lure/sound.h
index 58b4a68966..9fa9a91260 100644
--- a/engines/lure/sound.h
+++ b/engines/lure/sound.h
@@ -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);
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp
index 106b62b7a4..bfada8fde6 100644
--- a/engines/lure/surface.cpp
+++ b/engines/lure/surface.cpp
@@ -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;
}
diff --git a/engines/lure/surface.h b/engines/lure/surface.h
index 56af37c049..d56e37632b 100644
--- a/engines/lure/surface.h
+++ b/engines/lure/surface.h
@@ -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; }
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-08 22:03:11 +0000