aboutsummaryrefslogtreecommitdiff
path: root/engines/queen
diff options
context:
space:
mode:
Diffstat (limited to 'engines/queen')
-rw-r--r--engines/queen/command.cpp4
-rw-r--r--engines/queen/command.h2
-rw-r--r--engines/queen/cutaway.cpp4
-rw-r--r--engines/queen/display.h4
-rw-r--r--engines/queen/logic.cpp2
-rw-r--r--engines/queen/musicdata.cpp6
-rw-r--r--engines/queen/queen.cpp11
-rw-r--r--engines/queen/queen.h2
-rw-r--r--engines/queen/structs.h6
-rw-r--r--engines/queen/walk.cpp4
10 files changed, 21 insertions, 24 deletions
diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp
index 4f86d1f7ec..7876dbfae9 100644
--- a/engines/queen/command.cpp
+++ b/engines/queen/command.cpp
@@ -1081,10 +1081,10 @@ void Command::setAreas(uint16 command) {
Area *area = _vm->grid()->area(cmdArea->room, areaNum);
if (cmdArea->area > 0) {
// turn on area
- area->mapNeighbours = ABS(area->mapNeighbours);
+ area->mapNeighbors = ABS(area->mapNeighbors);
} else {
// turn off area
- area->mapNeighbours = -ABS(area->mapNeighbours);
+ area->mapNeighbors = -ABS(area->mapNeighbors);
}
}
}
diff --git a/engines/queen/command.h b/engines/queen/command.h
index 772d6cb0f1..aa72537a9f 100644
--- a/engines/queen/command.h
+++ b/engines/queen/command.h
@@ -97,7 +97,7 @@ public:
Command(QueenEngine *vm);
~Command();
- //! initialise command construction
+ //! initialize command construction
void clear(bool clearTexts);
//! execute last constructed command
diff --git a/engines/queen/cutaway.cpp b/engines/queen/cutaway.cpp
index 70d8252299..de54b7e33c 100644
--- a/engines/queen/cutaway.cpp
+++ b/engines/queen/cutaway.cpp
@@ -1152,10 +1152,10 @@ void Cutaway::updateGameState() {
if (areaSubIndex > 0) {
Area *area = _vm->grid()->area(areaIndex, areaSubIndex);
- area->mapNeighbours = ABS(area->mapNeighbours);
+ area->mapNeighbors = ABS(area->mapNeighbors);
} else {
Area *area = _vm->grid()->area(areaIndex, ABS(areaSubIndex));
- area->mapNeighbours = -ABS(area->mapNeighbours);
+ area->mapNeighbors = -ABS(area->mapNeighbors);
}
}
diff --git a/engines/queen/display.h b/engines/queen/display.h
index ffb4479426..4256b19d72 100644
--- a/engines/queen/display.h
+++ b/engines/queen/display.h
@@ -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
diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp
index db496bee39..f60ac59ff1 100644
--- a/engines/queen/logic.cpp
+++ b/engines/queen/logic.cpp
@@ -1626,7 +1626,7 @@ void Logic::asmSetLightsOn() {
void Logic::asmSetManequinAreaOn() {
Area *a = _vm->grid()->area(ROOM_FLODA_FRONTDESK, 7);
- a->mapNeighbours = ABS(a->mapNeighbours);
+ a->mapNeighbors = ABS(a->mapNeighbors);
}
void Logic::asmPanToJoe() {
diff --git a/engines/queen/musicdata.cpp b/engines/queen/musicdata.cpp
index afcc54d2e6..d3974dcdbf 100644
--- a/engines/queen/musicdata.cpp
+++ b/engines/queen/musicdata.cpp
@@ -493,7 +493,7 @@ const SongData Sound::_song[] = {
/* 124 - Dino Horn */
{ { 127, 0 }, 128, 128, 128, 0, 1 },
- /* 125 - Tyre Screech */
+ /* 125 - Tire Screech */
{ { 128, 0 }, 128, 128, 128, 0, 1 },
/* 126 - Oil Splat */
@@ -1238,7 +1238,7 @@ const TuneData Sound::_tune[] = {
/* 127 - Dino Horn */
{ { 0, 0 }, { 67, 0 }, 2, 0 },
- /* 128 - Tyre Screech */
+ /* 128 - Tire Screech */
{ { 0, 0 }, { 68, 0 }, 2, 0 },
/* 129 - Oil Splat */
@@ -1697,7 +1697,7 @@ const char *Sound::_sfxName[] = {
/* 67 - Dino Horn */
"103sssss",
- /* 68 - Tyre Screech */
+ /* 68 - Tire Screech */
"125sssss",
/* 69 - Chicken */
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 97f757c418..a10e74bfd8 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -69,7 +69,7 @@ public:
};
const char *QueenMetaEngine::getName() const {
- return "Flight of the Amazon Queen";
+ return "Queen";
}
const char *QueenMetaEngine::getOriginalCopyright() const {
@@ -168,11 +168,8 @@ SaveStateList QueenMetaEngine::listSaves(const char *target) const {
}
void QueenMetaEngine::removeSaveState(const char *target, int slot) const {
- char extension[6];
- snprintf(extension, sizeof(extension), ".s%02d", slot);
-
Common::String filename = target;
- filename += extension;
+ filename += Common::String::format(".s%02d", slot);
g_system->getSavefileManager()->removeSavefile(filename);
}
@@ -318,7 +315,7 @@ bool QueenEngine::canLoadOrSave() const {
return !_input->cutawayRunning() && !(_resource->isDemo() || _resource->isInterview());
}
-Common::Error QueenEngine::saveGameState(int slot, const char *desc) {
+Common::Error QueenEngine::saveGameState(int slot, const Common::String &desc) {
debug(3, "Saving game to slot %d", slot);
char name[20];
Common::Error err = Common::kNoError;
@@ -341,7 +338,7 @@ Common::Error QueenEngine::saveGameState(int slot, const char *desc) {
file->writeUint32BE(0);
file->writeUint32BE(dataSize);
char description[32];
- Common::strlcpy(description, desc, sizeof(description));
+ Common::strlcpy(description, desc.c_str(), sizeof(description));
file->write(description, sizeof(description));
// write save data
diff --git a/engines/queen/queen.h b/engines/queen/queen.h
index 5affe8e01a..bb299e2a80 100644
--- a/engines/queen/queen.h
+++ b/engines/queen/queen.h
@@ -112,7 +112,7 @@ public:
void update(bool checkPlayerInput = false);
bool canLoadOrSave() const;
- Common::Error saveGameState(int slot, const char *desc);
+ Common::Error saveGameState(int slot, const Common::String &desc);
Common::Error loadGameState(int slot);
void makeGameStateName(int slot, char *buf) const;
int getGameStateSlot(const char *filename) const;
diff --git a/engines/queen/structs.h b/engines/queen/structs.h
index b0a26ed4ba..6dd98fa1f5 100644
--- a/engines/queen/structs.h
+++ b/engines/queen/structs.h
@@ -77,7 +77,7 @@ struct Box {
struct Area {
//! bitmask of connected areas
- int16 mapNeighbours;
+ int16 mapNeighbors;
//! coordinates defining area limits
Box box;
//! scaling factors for bobs actors
@@ -86,7 +86,7 @@ struct Area {
uint16 object;
void readFromBE(byte *&ptr) {
- mapNeighbours = (int16)READ_BE_UINT16(ptr); ptr += 2;
+ mapNeighbors = (int16)READ_BE_UINT16(ptr); ptr += 2;
box.readFromBE(ptr);
bottomScaleFactor = READ_BE_UINT16(ptr); ptr += 2;
topScaleFactor = READ_BE_UINT16(ptr); ptr += 2;
@@ -94,7 +94,7 @@ struct Area {
}
void writeToBE(byte *&ptr) {
- WRITE_BE_UINT16(ptr, mapNeighbours); ptr += 2;
+ WRITE_BE_UINT16(ptr, mapNeighbors); ptr += 2;
box.writeToBE(ptr);
WRITE_BE_UINT16(ptr, bottomScaleFactor); ptr += 2;
WRITE_BE_UINT16(ptr, topScaleFactor); ptr += 2;
diff --git a/engines/queen/walk.cpp b/engines/queen/walk.cpp
index c5cfbb7d5f..b5c9b97ce0 100644
--- a/engines/queen/walk.cpp
+++ b/engines/queen/walk.cpp
@@ -111,7 +111,7 @@ void Walk::animateJoe() {
WalkData *pwd = &_walkData[i];
// area has been turned off, see if we should execute a cutaway
- if (pwd->area->mapNeighbours < 0) {
+ if (pwd->area->mapNeighbors < 0) {
// queen.c l.2838-2911
_vm->logic()->handleSpecialArea(pwd->anim.facing, pwd->areaNum, i);
_joeMoveBlock = true;
@@ -482,7 +482,7 @@ int16 Walk::findAreaPosition(int16 *x, int16 *y, bool recalibrate) {
uint16 Walk::findFreeArea(uint16 area) const {
uint16 testArea;
uint16 freeArea = 0;
- uint16 map = ABS(_roomArea[area].mapNeighbours);
+ uint16 map = ABS(_roomArea[area].mapNeighbors);
for (testArea = 1; testArea <= _roomAreaCount; ++testArea) {
int b = _roomAreaCount - testArea;
if (map & (1 << b)) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-15 05:04:24 +0000