Skip to content

Commit

Permalink
DREAMWEB: Some British to American english
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Feb 19, 2014
1 parent 2c7f6a9 commit 137f625
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion engines/dreamweb/dreamweb.cpp
View file
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions engines/dreamweb/dreamweb.h
View file
Expand Up @@ -415,7 +415,7 @@ class DreamWebEngine : public Engine {
uint8 _saveLoadPage;
uint8 _currentSlot;
uint8 _cursorPos;
uint8 _colourPos;
uint8 _colorPos;
uint8 _fadeDirection;
uint8 _numToFade;
uint8 _fadeCount;
Expand Down Expand Up @@ -515,8 +515,8 @@ class DreamWebEngine : public Engine {
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);
Expand Down Expand Up @@ -996,7 +996,7 @@ class DreamWebEngine : public Engine {
void useDryer();
void callEdensDLift();
void callEdensLift();
void openYourNeighbour();
void openYourNeighbor();
void openRyan();
void openPoolBoss();
void openEden();
Expand Down
8 changes: 4 additions & 4 deletions engines/dreamweb/newplace.cpp
View file
Expand Up @@ -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)
Expand All @@ -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);
}

Expand Down
6 changes: 3 additions & 3 deletions engines/dreamweb/stubs.cpp
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions engines/dreamweb/use.cpp
View file
Expand Up @@ -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" },
Expand Down Expand Up @@ -458,7 +458,7 @@ void DreamWebEngine::callEdensDLift() {
}
}

void DreamWebEngine::openYourNeighbour() {
void DreamWebEngine::openYourNeighbor() {
enterCode(255, 255, 255, 255);
_getBack = 1;
}
Expand Down
28 changes: 14 additions & 14 deletions engines/dreamweb/vgafades.cpp
View file
Expand Up @@ -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();
}

Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -166,7 +166,7 @@ void DreamWebEngine::fadeScreenUp() {
palToEndPal();
_fadeDirection = 1;
_fadeCount = 63;
_colourPos = 0;
_colorPos = 0;
_numToFade = 128;
}

Expand All @@ -175,7 +175,7 @@ void DreamWebEngine::fadeScreenUps() {
palToEndPal();
_fadeDirection = 1;
_fadeCount = 63;
_colourPos = 0;
_colorPos = 0;
_numToFade = 64;
}

Expand All @@ -184,7 +184,7 @@ void DreamWebEngine::fadeScreenUpHalf() {
palToEndPal();
_fadeDirection = 1;
_fadeCount = 31;
_colourPos = 0;
_colorPos = 0;
_numToFade = 32;
}

Expand All @@ -193,7 +193,7 @@ void DreamWebEngine::fadeScreenDown() {
clearEndPal();
_fadeDirection = 1;
_fadeCount = 63;
_colourPos = 0;
_colorPos = 0;
_numToFade = 128;
}

Expand All @@ -202,7 +202,7 @@ void DreamWebEngine::fadeScreenDowns() {
clearEndPal();
_fadeDirection = 1;
_fadeCount = 63;
_colourPos = 0;
_colorPos = 0;
_numToFade = 64;
}

Expand All @@ -222,7 +222,7 @@ void DreamWebEngine::fadeScreenDownHalf() {

_fadeDirection = 1;
_fadeCount = 31;
_colourPos = 0;
_colorPos = 0;
_numToFade = 32;
}

Expand Down
2 changes: 1 addition & 1 deletion engines/dreamweb/vgagrafx.cpp
View file
Expand Up @@ -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;
}
Expand Down

0 comments on commit 137f625

Please sign in to comment.