aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/dreamweb/dreamweb.cpp2
-rw-r--r--engines/dreamweb/dreamweb.h8
-rw-r--r--engines/dreamweb/newplace.cpp8
-rw-r--r--engines/dreamweb/stubs.cpp6
-rw-r--r--engines/dreamweb/use.cpp4
-rw-r--r--engines/dreamweb/vgafades.cpp28
-rw-r--r--engines/dreamweb/vgagrafx.cpp2
7 files changed, 29 insertions, 29 deletions
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 3fe20bd5d8..94a2e60ef1 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -199,7 +199,7 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
_saveLoadPage = 0;
_currentSlot = 0;
_cursorPos = 0;
- _colourPos = 0;
+ _colorPos = 0;
_fadeDirection = 0;
_numToFade = 0;
_fadeCount = 0;
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index d572e2b298..e39f8c0d51 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -415,7 +415,7 @@ public:
uint8 _saveLoadPage;
uint8 _currentSlot;
uint8 _cursorPos;
- uint8 _colourPos;
+ uint8 _colorPos;
uint8 _fadeDirection;
uint8 _numToFade;
uint8 _fadeCount;
@@ -515,8 +515,8 @@ public:
int findCommand(const char *const cmdList[]);
// from newplace.cpp
- void getUnderCentre();
- void putUnderCentre();
+ void getUnderCenter();
+ void putUnderCenter();
void showArrows();
uint8 getLocation(uint8 index);
void setLocation(uint8 index);
@@ -996,7 +996,7 @@ public:
void useDryer();
void callEdensDLift();
void callEdensLift();
- void openYourNeighbour();
+ void openYourNeighbor();
void openRyan();
void openPoolBoss();
void openEden();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index b2975d29b8..3834a114e5 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -113,7 +113,7 @@ void DreamWebEngine::lookAtPlace() {
delPointer();
delTextLine();
- getUnderCentre();
+ getUnderCenter();
showFrame(_newplaceGraphics3, 60, 72, 0, 0);
showFrame(_newplaceGraphics3, 60, 72 + 55, 4, 0);
if (_foreignRelease)
@@ -127,15 +127,15 @@ void DreamWebEngine::lookAtPlace() {
hangOnP(500);
_pointerMode = 0;
_pointerFrame = 0;
- putUnderCentre();
+ putUnderCenter();
workToScreenM();
}
-void DreamWebEngine::getUnderCentre() {
+void DreamWebEngine::getUnderCenter() {
multiGet(_mapStore, 58, 72, 254, 110);
}
-void DreamWebEngine::putUnderCentre() {
+void DreamWebEngine::putUnderCenter() {
multiPut(_mapStore, 58, 72, 254, 110);
}
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a4fd6dfd48..68b223392c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2566,14 +2566,14 @@ void DreamWebEngine::showGun() {
greyscaleSum();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(130);
endPalToStart();
clearEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(200);
_roomsSample = 34;
@@ -2749,7 +2749,7 @@ void DreamWebEngine::entryAnims() {
// Make doors open
removeSetObject(4);
placeSetObject(5);
- } else if (_vars._location == 47) { // Dream centre
+ } else if (_vars._location == 47) { // Dream center
placeSetObject(4);
placeSetObject(5);
} else if (_vars._location == 38) { // Car park
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index b8b99c6df6..01aefd97e6 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -73,7 +73,7 @@ void DreamWebEngine::useRoutine() {
{ &DreamWebEngine::openLouis, "ENTA" },
{ &DreamWebEngine::openRyan, "ENTB" },
{ &DreamWebEngine::openPoolBoss, "ENTE" },
- { &DreamWebEngine::openYourNeighbour, "ENTC" },
+ { &DreamWebEngine::openYourNeighbor, "ENTC" },
{ &DreamWebEngine::openEden, "ENTD" },
{ &DreamWebEngine::openSarters, "ENTH" },
{ &DreamWebEngine::wearWatch, "WWAT" },
@@ -458,7 +458,7 @@ void DreamWebEngine::callEdensDLift() {
}
}
-void DreamWebEngine::openYourNeighbour() {
+void DreamWebEngine::openYourNeighbor() {
enterCode(255, 255, 255, 255);
_getBack = 1;
}
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index a0f14e1409..65930aef7d 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -72,11 +72,11 @@ void DreamWebEngine::doFade() {
return;
processEvents();
- uint8 *src = _startPal + 3 * _colourPos;
- setPalette(src, _colourPos, _numToFade);
+ uint8 *src = _startPal + 3 * _colorPos;
+ setPalette(src, _colorPos, _numToFade);
- _colourPos += _numToFade;
- if (_colourPos == 0)
+ _colorPos += _numToFade;
+ if (_colorPos == 0)
fadeCalculation();
}
@@ -109,7 +109,7 @@ void DreamWebEngine::fadeUpYellows() {
memset(_endPal + 246 * 3, 0, 1 * 3);
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(128);
}
@@ -121,7 +121,7 @@ void DreamWebEngine::fadeUpMonFirst() {
memset(_startPal + 246 * 3, 0, 1 * 3);
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(64);
_sound->playChannel1(26);
@@ -136,7 +136,7 @@ void DreamWebEngine::fadeDownMon() {
memset(_endPal + 246 * 3, 0, 1 * 3);
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(64);
}
@@ -148,7 +148,7 @@ void DreamWebEngine::fadeUpMon() {
memset(_startPal + 246 * 3, 0, 1 * 3);
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
hangOn(128);
}
@@ -166,7 +166,7 @@ void DreamWebEngine::fadeScreenUp() {
palToEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
}
@@ -175,7 +175,7 @@ void DreamWebEngine::fadeScreenUps() {
palToEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 64;
}
@@ -184,7 +184,7 @@ void DreamWebEngine::fadeScreenUpHalf() {
palToEndPal();
_fadeDirection = 1;
_fadeCount = 31;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 32;
}
@@ -193,7 +193,7 @@ void DreamWebEngine::fadeScreenDown() {
clearEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 128;
}
@@ -202,7 +202,7 @@ void DreamWebEngine::fadeScreenDowns() {
clearEndPal();
_fadeDirection = 1;
_fadeCount = 63;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 64;
}
@@ -222,7 +222,7 @@ void DreamWebEngine::fadeScreenDownHalf() {
_fadeDirection = 1;
_fadeCount = 31;
- _colourPos = 0;
+ _colorPos = 0;
_numToFade = 32;
}
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index ef8b4830b2..e8531343f8 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -235,7 +235,7 @@ void DreamWebEngine::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y
void DreamWebEngine::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height) {
if (effectsFlag) {
- if (effectsFlag & 128) { //centred
+ if (effectsFlag & 128) { //centered
x -= width / 2;
y -= height / 2;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 17:20:34 +0000