diff options
| author | Matthew Hoops | 2011-05-25 09:56:31 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-25 10:50:46 -0400 |
| commit | 1277975c6685d13a05a2e77dc5f5604f3a4620bf (patch) | |
| tree | e17dae335c9250c0637a9655b9e0913e805d5636 /engines/queen | |
| parent | 8615cecfe07ee4d76d9620dd96d11c8ce4df5011 (diff) | |
| download | scummvm-rg350-1277975c6685d13a05a2e77dc5f5604f3a4620bf.tar.gz scummvm-rg350-1277975c6685d13a05a2e77dc5f5604f3a4620bf.tar.bz2 scummvm-rg350-1277975c6685d13a05a2e77dc5f5604f3a4620bf.zip | |
ALL: neighbour -> neighbor
Diffstat (limited to 'engines/queen')
| -rw-r--r-- | engines/queen/command.cpp | 4 | ||||
| -rw-r--r-- | engines/queen/cutaway.cpp | 4 | ||||
| -rw-r--r-- | engines/queen/logic.cpp | 2 | ||||
| -rw-r--r-- | engines/queen/structs.h | 6 | ||||
| -rw-r--r-- | engines/queen/walk.cpp | 4 |
5 files changed, 10 insertions, 10 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)) { |
