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

ALL: neighbour -> neighbor

Browse source
This commit is contained in:
Matthew Hoops 2011-05-25 09:56:31 -04:00
parent 8615cecfe0
commit 1277975c66
13 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/queen/command.cpp
View file

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

4
engines/queen/cutaway.cpp
View file

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

2
engines/queen/logic.cpp
View file

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

6
engines/queen/structs.h
View file

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

4
engines/queen/walk.cpp
View file

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

10
engines/scumm/boxes.cpp
View file

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

2
engines/scumm/gfx.cpp
View file

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

2
engines/scumm/scumm.h
View file

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

2
engines/scumm/scumm_v0.h
View file

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

2
engines/sword1/router.cpp
View file

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

2
engines/sword2/router.cpp
View file

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

2
engines/tinsel/move.cpp
View file

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

6
graphics/scaler.cpp
View file

@ -196,7 +196,7 @@ void Normal2x(const uint8 *srcPtr,
#else
/**
* Trivial nearest-neighbour 2x scaler.
* Trivial nearest-neighbor 2x scaler.
*/
void Normal2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
int width, int height) {
@ -221,7 +221,7 @@ void Normal2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit
#endif
/**
* Trivial nearest-neighbour 3x scaler.
* Trivial nearest-neighbor 3x scaler.
*/
void Normal3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
int width, int height) {
@ -254,7 +254,7 @@ void Normal3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit
#define interpolate_1_1_1_1 interpolate16_1_1_1_1<ColorMask>
/**
* Trivial nearest-neighbour 1.5x scaler.
* Trivial nearest-neighbor 1.5x scaler.
*/
template<typename ColorMask>
void Normal1o5xTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,