libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-30 22:23:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MORTEVIELLE: Replace some British words by US ones

Browse Source
This commit is contained in:
Strangerke 2013-07-19 10:59:20 +02:00
parent 747d8f3047
commit 5924230634
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/mortevielle/graphics.cpp
View File

@ -40,7 +40,7 @@ namespace Mortevielle {
*-------------------------------------------------------------------------*/
/**
* Set palette entries from the 64 colour available EGA palette
* Set palette entries from the 64 color available EGA palette
*/
void PaletteManager::setPalette(const int *palette, uint idx, uint size) {
assert((idx + size) <= 16);
@ -55,7 +55,7 @@ void PaletteManager::setPalette(const int *palette, uint idx, uint size) {
*p++ = (i & 1) * 0xaa + (i >> 3 & 1) * 0x55;
}
// Loop through setting palette colours based on the passed indexes
// Loop through setting palette colors based on the passed indexes
for (; size > 0; --size, ++idx) {
int palIndex = palette[idx];
assert(palIndex < 64);
@ -416,7 +416,7 @@ void GfxSurface::decode(const byte *pSrc) {
entryIndex + 1, _xp, _yp, _width, _height, decomIndex);
}
// At this point, the outputBuffer has the data for the image. Initialise the surface
// At this point, the outputBuffer has the data for the image. Initialize the surface
// with the calculated size, and copy the lines to the surface
create(_width, _height, Graphics::PixelFormat::createFormatCLUT8());
@ -1033,16 +1033,16 @@ void ScreenSurface::drawBox(int x, int y, int dx, int dy, int col) {
}
/**
* Fills an area with the specified colour
* Fills an area with the specified color
* @remarks Because the ScummVM surface is using a double height 640x400 surface to
* simulate the original 640x400 surface, all Y values have to be doubled
*/
void ScreenSurface::fillRect(int colour, const Common::Rect &bounds) {
void ScreenSurface::fillRect(int color, const Common::Rect &bounds) {
Graphics::Surface destSurface = lockArea(Common::Rect(bounds.left, bounds.top * 2,
bounds.right, bounds.bottom * 2));
// Fill the area
destSurface.fillRect(Common::Rect(0, 0, destSurface.w, destSurface.h), colour);
destSurface.fillRect(Common::Rect(0, 0, destSurface.w, destSurface.h), color);
}
/**

2
engines/mortevielle/graphics.h
View File

@ -100,7 +100,7 @@ public:
void copyFrom(Graphics::Surface &src, int x, int y);
void writeCharacter(const Common::Point &pt, unsigned char ch, int palIndex);
void drawBox(int x, int y, int dx, int dy, int col);
void fillRect(int colour, const Common::Rect &bounds);
void fillRect(int color, const Common::Rect &bounds);
void clearScreen();
void putxy(int x, int y) { _textPos = Common::Point(x, y); }
void drawString(const Common::String &l, int command);

12
engines/mortevielle/mortevielle.cpp
View File

@ -160,10 +160,10 @@ Common::String MortevielleEngine::generateSaveFilename(const Common::String &tar
}
/**
* Initialise the game state
* Initialize the game state
*/
Common::ErrorCode MortevielleEngine::initialise() {
// Initialise graphics mode
Common::ErrorCode MortevielleEngine::initialize() {
// Initialize graphics mode
initGraphics(SCREEN_WIDTH, SCREEN_HEIGHT, true);
// Set debug channels
@ -329,8 +329,8 @@ void MortevielleEngine::readStaticStrings(Common::File &f, int dataSize, DataTyp
/*-------------------------------------------------------------------------*/
Common::Error MortevielleEngine::run() {
// Initialise the game
Common::ErrorCode err = initialise();
// Initialize the game
Common::ErrorCode err = initialize();
if (err != Common::kNoError)
return err;
@ -353,7 +353,7 @@ Common::Error MortevielleEngine::run() {
// Run the main game loop
mainGame();
// Cleanup (allocated in initialise())
// Cleanup (allocated in initialize())
_screenSurface.free();
free(_speechManager._cfiphBuffer);
free(_cfiecBuffer);

2
engines/mortevielle/mortevielle.h
View File

@ -284,7 +284,7 @@ private:
uint16 _dialogIndexArray[kMaxDialogIndex + 1];
Hint _dialogHintArray[kMaxDialogHint + 1];
Common::ErrorCode initialise();
Common::ErrorCode initialize();
Common::ErrorCode loadMortDat();
void readStaticStrings(Common::File &f, int dataSize, DataType dataType);
void loadFont(Common::File &f);