diff options
| -rw-r--r-- | engines/avalanche/celer2.cpp | 6 | ||||
| -rw-r--r-- | engines/avalanche/dropdown2.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/dropdown2.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/graphics.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/lucerna2.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/lucerna2.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/scrolls2.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/trip6.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/trip6.h | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/engines/avalanche/celer2.cpp b/engines/avalanche/celer2.cpp index ababd4a86d..2d16dc6de9 100644 --- a/engines/avalanche/celer2.cpp +++ b/engines/avalanche/celer2.cpp @@ -289,9 +289,9 @@ void Celer::loadBackgroundSprites(byte number) { sprite._yl = f.readSint16LE(); sprite._size = f.readSint32LE(); bool natural = f.readByte(); - bool memorise = f.readByte(); + bool memorize = f.readByte(); - if (memorise) { + if (memorize) { _sprites[i]._x = sprite._x; _sprites[i]._xl = sprite._xl; _sprites[i]._y = sprite._y; @@ -349,7 +349,7 @@ void Celer::drawBackgroundSprite(int16 destX, int16 destY, byte which) { sprite._xl = f.readSint16LE(); sprite._yl = f.readSint16LE(); sprite._size = f.readSint32LE(); - f.skip(2); // For the now not existing natural and memorise data members of the SpriteType (called chunkblocktype in the original). + f.skip(2); // For the now not existing natural and memorize data members of the SpriteType (called chunkblocktype in the original). sprite._picture = _vm->_graphics->loadPictureRow(f, sprite._xl * 8, sprite._yl + 1); if (destX < 0) { diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown2.cpp index 4ef65046cc..064af299dc 100644 --- a/engines/avalanche/dropdown2.cpp +++ b/engines/avalanche/dropdown2.cpp @@ -25,7 +25,7 @@ * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman. */ - /* DROPDOWN A customised version of Oopmenu (qv). */ + /* DROPDOWN A customized version of Oopmenu (qv). */ #include "avalanche/avalanche.h" diff --git a/engines/avalanche/dropdown2.h b/engines/avalanche/dropdown2.h index f0f3917457..7b8f972330 100644 --- a/engines/avalanche/dropdown2.h +++ b/engines/avalanche/dropdown2.h @@ -25,7 +25,7 @@ * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman. */ -/* DROPDOWN A customised version of Oopmenu (qv). */ +/* DROPDOWN A customized version of Oopmenu (qv). */ #ifndef DROPDOWN2_H #define DROPDOWN2_H diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp index b6dbe16c61..eaf547c018 100644 --- a/engines/avalanche/graphics.cpp +++ b/engines/avalanche/graphics.cpp @@ -77,7 +77,7 @@ Graphics::~Graphics() { } -void Graphics::flesh_colours() +void Graphics::flesh_colors() { g_system->getPaletteManager()->setPalette(_egaPalette[39], 13, 1); g_system->getPaletteManager()->setPalette(_egaPalette[28], 5, 1); diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h index ca28772156..7f27186bac 100644 --- a/engines/avalanche/graphics.h +++ b/engines/avalanche/graphics.h @@ -84,7 +84,7 @@ public: ~Graphics(); - void flesh_colours(); + void flesh_colors(); byte *getPixel(int16 x, int16 y); diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index 2b4c5fe363..8b278f05fc 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -219,7 +219,7 @@ void Lucerna::load(byte n) { /* Load2, actually */ CursorMan.showMouse(false); - _vm->_graphics->flesh_colours(); + _vm->_graphics->flesh_colors(); xx = _vm->_gyro->strf(n); Common::String filename; diff --git a/engines/avalanche/lucerna2.h b/engines/avalanche/lucerna2.h index 8c497212b4..db9e43191f 100644 --- a/engines/avalanche/lucerna2.h +++ b/engines/avalanche/lucerna2.h @@ -102,7 +102,7 @@ public: uint16 bearing(byte whichped); // Returns the bearing from ped Whichped to Avvy, in degrees. - void flesh_colours(); + void flesh_colors(); void sprite_run(); diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index 300d275346..6c1ef73d93 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -736,7 +736,7 @@ void Scrolls::calldrivers() { _vm->_gyro->talky = _vm->_gyro->peds[_vm->_gyro->quasipeds[param - 10].whichped - 1].y; // Position. _vm->_gyro->talkf = _vm->_gyro->quasipeds[param - 10].fgc; - _vm->_gyro->talkb = _vm->_gyro->quasipeds[param - 10].bgc; // Colours. + _vm->_gyro->talkb = _vm->_gyro->quasipeds[param - 10].bgc; // Colors. } else { _vm->_lucerna->errorled(); // Not valid. natural(); diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp index dc45c6c2d7..7e444dc1ee 100644 --- a/engines/avalanche/trip6.cpp +++ b/engines/avalanche/trip6.cpp @@ -447,7 +447,7 @@ triptype *triptype::done() { getsettype *getsettype::init() { - numleft = 0; /* initialise array pointer */ + numleft = 0; /* initialize array pointer */ return this; } diff --git a/engines/avalanche/trip6.h b/engines/avalanche/trip6.h index cc13c9bf75..f91e72c2f3 100644 --- a/engines/avalanche/trip6.h +++ b/engines/avalanche/trip6.h @@ -44,7 +44,7 @@ struct adxtype { /* Second revision of ADX type */ Common::String comment/*[17]*/; /* comment */ // uruk: Same here, but 16. byte num; /* number of pictures */ byte seq; /* how many in one stride */ - byte fgc, bgc; /* foreground & background bubble colours */ + byte fgc, bgc; /* foreground & background bubble colors */ byte accinum; /* the number according to Acci (1=Avvy, etc.) */ }; |