aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/queen/command.cpp4
-rw-r--r--engines/queen/cutaway.cpp4
-rw-r--r--engines/queen/logic.cpp2
-rw-r--r--engines/queen/structs.h6
-rw-r--r--engines/queen/walk.cpp4
-rw-r--r--engines/scumm/boxes.cpp10
-rw-r--r--engines/scumm/gfx.cpp2
-rw-r--r--engines/scumm/scumm.h2
-rw-r--r--engines/scumm/scumm_v0.h2
-rw-r--r--engines/sword1/router.cpp2
-rw-r--r--engines/sword2/router.cpp2
-rw-r--r--engines/tinsel/move.cpp2
12 files changed, 21 insertions, 21 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/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/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/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)) {
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index ba4dedfbd3..1acb7e5586 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -726,7 +726,7 @@ int ScummEngine::getNextBox(byte from, byte to) {
dest = to;
do {
dest = itineraryMatrix[numOfBoxes * from + dest];
- } while (dest != Actor::kInvalidBox && !areBoxesNeighbours(from, dest));
+ } while (dest != Actor::kInvalidBox && !areBoxesNeighbors(from, dest));
if (dest == Actor::kInvalidBox)
dest = -1;
@@ -970,7 +970,7 @@ void ScummEngine::calcItineraryMatrix(byte *itineraryMatrix, int num) {
if (i == j) {
adjacentMatrix[i * boxSize + j] = 0;
itineraryMatrix[i * boxSize + j] = j;
- } else if (areBoxesNeighbours(i, j)) {
+ } else if (areBoxesNeighbors(i, j)) {
adjacentMatrix[i * boxSize + j] = 1;
itineraryMatrix[i * boxSize + j] = j;
} else {
@@ -1060,8 +1060,8 @@ void ScummEngine::createBoxMatrix() {
free(itineraryMatrix);
}
-/** Check if two boxes are neighbours. */
-bool ScummEngine::areBoxesNeighbours(int box1nr, int box2nr) {
+/** Check if two boxes are neighbors. */
+bool ScummEngine::areBoxesNeighbors(int box1nr, int box2nr) {
Common::Point tmp;
BoxCoords box;
BoxCoords box2;
@@ -1158,7 +1158,7 @@ bool ScummEngine::areBoxesNeighbours(int box1nr, int box2nr) {
return false;
}
-bool ScummEngine_v0::areBoxesNeighbours(int box1nr, int box2nr) {
+bool ScummEngine_v0::areBoxesNeighbors(int box1nr, int box2nr) {
int i;
const int numOfBoxes = getNumBoxes();
const byte *boxm;
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 08ae9fdd96..1b913e16b4 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -583,7 +583,7 @@ void ScummEngine::updateDirtyScreen(VirtScreenNumber slot) {
vs->tdirty[i] = vs->h;
vs->bdirty[i] = 0;
if (i != (_gdi->_numStrips - 1) && vs->bdirty[i + 1] == bottom && vs->tdirty[i + 1] == top) {
- // Simple optimizations: if two or more neighbouring strips
+ // Simple optimizations: if two or more neighboring strips
// form one bigger rectangle, coalesce them.
w += 8;
continue;
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 636c909911..60bcd97d7c 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -1120,7 +1120,7 @@ protected:
void calcItineraryMatrix(byte *itineraryMatrix, int num);
void createBoxMatrix();
- virtual bool areBoxesNeighbours(int i, int j);
+ virtual bool areBoxesNeighbors(int i, int j);
/* String class */
public:
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 9c492663dc..af481df0e0 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -94,7 +94,7 @@ protected:
virtual void resetSentence(bool walking);
- virtual bool areBoxesNeighbours(int box1nr, int box2nr);
+ virtual bool areBoxesNeighbors(int box1nr, int box2nr);
/* Version C64 script opcodes */
void o_stopCurrentScript();
diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp
index e3b6ab3343..aaf475912d 100644
--- a/engines/sword1/router.cpp
+++ b/engines/sword1/router.cpp
@@ -261,7 +261,7 @@ int32 Router::getRoute() {
// of a line
// scan through the nodes linking each node to its nearest
- // neighbour until no more nodes change
+ // neighbor until no more nodes change
// This is the routine that finds a route using scan()
diff --git a/engines/sword2/router.cpp b/engines/sword2/router.cpp
index fa5a677b86..d3f274dd2c 100644
--- a/engines/sword2/router.cpp
+++ b/engines/sword2/router.cpp
@@ -320,7 +320,7 @@ int32 Router::getRoute() {
// of a line
// scan through the nodes linking each node to its nearest
- // neighbour until no more nodes change
+ // neighbor until no more nodes change
// This is the routine that finds a route using scan()
diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp
index d6b96fee7b..e20f28d528 100644
--- a/engines/tinsel/move.cpp
+++ b/engines/tinsel/move.cpp
@@ -578,7 +578,7 @@ static void SetMoverUltDest(PMOVER pActor, int x, int y) {
* Set intermediate destination.
*
* If in final destination path, go straight to target.
- * If in a neighbouring path to the final destination, if the target path
+ * If in a neighboring path to the final destination, if the target path
* is a follow nodes path, head for the end node, otherwise head straight
* for the target.
* Otherwise, head towards the pseudo-center or end node of the first
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 20:59:35 +0000