diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tony/custom.cpp | 12 | ||||
-rw-r--r-- | engines/tony/font.cpp | 16 | ||||
-rw-r--r-- | engines/tony/font.h | 2 | ||||
-rw-r--r-- | engines/tony/gfxcore.cpp | 4 | ||||
-rw-r--r-- | engines/tony/gfxcore.h | 12 | ||||
-rw-r--r-- | engines/tony/gfxengine.cpp | 10 | ||||
-rw-r--r-- | engines/tony/gfxengine.h | 2 | ||||
-rw-r--r-- | engines/tony/inventory.cpp | 2 | ||||
-rw-r--r-- | engines/tony/loc.cpp | 10 | ||||
-rw-r--r-- | engines/tony/loc.h | 2 | ||||
-rw-r--r-- | engines/tony/mpal/loadmpc.cpp | 2 | ||||
-rw-r--r-- | engines/tony/mpal/mpal.cpp | 4 | ||||
-rw-r--r-- | engines/tony/tony.cpp | 14 | ||||
-rw-r--r-- | engines/tony/tonychar.h | 2 | ||||
-rw-r--r-- | engines/tony/utils.h | 2 | ||||
-rw-r--r-- | engines/tony/window.cpp | 2 |
16 files changed, 49 insertions, 49 deletions
diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp index 6e057cf031..fd5d17470b 100644 --- a/engines/tony/custom.cpp +++ b/engines/tony/custom.cpp @@ -308,7 +308,7 @@ DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX // Alignment _ctx->text.setAlignType(RMText::HCENTER, RMText::VBOTTOM); - // Colour + // Color _ctx->text.setColor(0, 255, 0); // Writes the text @@ -427,7 +427,7 @@ DECLARE_CUSTOM_FUNCTION(SendFullscreenMsgStart)(CORO_PARAM, uint32 nMsg, uint32 // Forces the text to disappear in time _ctx->text.forceTime(); - // Colour + // Color _ctx->text.setColor(255, 255, 255); // Write the text @@ -1511,7 +1511,7 @@ DECLARE_CUSTOM_FUNCTION(CharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMess // Alignment _ctx->text->setAlignType(RMText::HCENTER, RMText::VBOTTOM); - // Colour + // Color _ctx->text->setColor(GLOBALS._character[nChar]._r, GLOBALS._character[nChar]._g, GLOBALS._character[nChar]._b); // Write the text @@ -1690,7 +1690,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes _ctx->parm = (GLOBALS._mCharacter[nChar]._curGroup * 10) + _vm->_randomSource.getRandomNumber( GLOBALS._mCharacter[nChar]._numTalks[GLOBALS._mCharacter[nChar]._curGroup] - 1) + 1; - // Try to run the custom function to initialise the speech + // Try to run the custom function to initialize the speech if (GLOBALS._mCharacter[nChar]._item) { _ctx->h = mpalQueryDoAction(30, GLOBALS._mCharacter[nChar]._item->mpalCode(), _ctx->parm); if (_ctx->h != CORO_INVALID_PID_VALUE) { @@ -1724,7 +1724,7 @@ DECLARE_CUSTOM_FUNCTION(MCharSendMessage)(CORO_PARAM, uint32 nChar, uint32 dwMes // Alignment _ctx->text->setAlignType(RMText::HCENTER, RMText::VBOTTOM); - // Colour + // Color _ctx->text->setColor(GLOBALS._mCharacter[nChar]._r, GLOBALS._mCharacter[nChar]._g, GLOBALS._mCharacter[nChar]._b); // Write the text @@ -1874,7 +1874,7 @@ DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg if (GLOBALS._mCharacter[nPers]._numTexts != 0 && GLOBALS._mCharacter[nPers]._bInTexts) { GLOBALS._mCharacter[nPers]._numTexts--; } else { - // Try to run the custom function to initialise the speech + // Try to run the custom function to initialize the speech _ctx->h = mpalQueryDoAction(30, GLOBALS._mCharacter[nPers]._item->mpalCode(), _ctx->parm); if (_ctx->h != CORO_INVALID_PID_VALUE) CORO_INVOKE_2(CoroScheduler.waitForSingleObject, _ctx->h, CORO_INFINITE); diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp index af6f5d687c..874d3d490b 100644 --- a/engines/tony/font.cpp +++ b/engines/tony/font.cpp @@ -67,9 +67,9 @@ void DumpFontBMP(const char *filename, const byte *buf, int nChars, int charX, i void RMFont::load(const byte *buf, int nChars, int dimx, int dimy, uint32 palResID) { _letter = new RMGfxSourceBuffer8RLEByte[nChars]; - // Initialise the fonts + // Initialize the fonts for (int i = 0; i < nChars; i++) { - // Initialise the buffer with the letters + // Initialize the buffer with the letters _letter[i].init(buf + i * (dimx * dimy + 8) + 8, dimx, dimy); _letter[i].loadPaletteWA(palResID); } @@ -172,7 +172,7 @@ void RMFontColor::setBaseColor(byte r1, byte g1, byte b1) { int i; byte pal[768 * 3]; - // Check if we are already on the right colour + // Check if we are already on the right color if (_fontR == r1 && _fontG == g1 && _fontB == b1) return; @@ -219,7 +219,7 @@ void RMFontParla::init(void) { load(RES_F_PARL, nchars, 20, 20); - // Initialise the f**king table + // Initialize the f**king table _lDefault = 13; _hDefault = 18; Common::fill(&_l2Table[0][0], &_l2Table[0][0] + (256 * 256), '\0'); @@ -1456,7 +1456,7 @@ void RMFontObj::init(void) { load(RES_F_OBJ, nchars, 25, 30); - // Initialise the f**king table + // Initialize the f**king table _lDefault = 26; _hDefault = 30; Common::fill(&_l2Table[0][0], &_l2Table[0][0] + (256 * 256), '\0'); @@ -1767,7 +1767,7 @@ void RMText::initStatics() { } RMText::RMText() { - // Default colour: white + // Default color: white _textR = _textG = _textB = 255; // Default length @@ -1804,7 +1804,7 @@ void RMText::removeThis(CORO_PARAM, bool &result) { void RMText::writeText(const RMString &text, int nFont, int *time) { - // Initialises the font (only once) + // Initializes the font (only once) if (_fonts[0] == NULL) { _fonts[0] = new RMFontParla; _fonts[0]->init(); @@ -1830,7 +1830,7 @@ void RMText::writeText(const RMString &text, RMFontColor *font, int *time) { char *string; int numlines; - // Set the base colour + // Set the base color font->setBaseColor(_textR, _textG, _textB); // Destroy the buffer before starting diff --git a/engines/tony/font.h b/engines/tony/font.h index f24223d551..1da1e063f7 100644 --- a/engines/tony/font.h +++ b/engines/tony/font.h @@ -224,7 +224,7 @@ public: // Overloading of the Draw to center the text, if necessary virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); - // Set the base colour + // Set the base color void setColor(byte r, byte g, byte b) { _textR = r; _textG = g; diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp index 2f38f5d05d..e973fe9f6b 100644 --- a/engines/tony/gfxcore.cpp +++ b/engines/tony/gfxcore.cpp @@ -204,7 +204,7 @@ bool RMGfxSourceBuffer::clip2D(int &x1, int &y1, int &u, int &v, int &width, int /** - * Initialises a surface by resource Id + * Initializes a surface by resource Id * * @param resID Resource ID * @param dimx Buffer X dimension @@ -1870,7 +1870,7 @@ void RMGfxSourceBuffer16::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimi } void RMGfxSourceBuffer16::prepareImage(void) { - // Colour space conversion if necessary! + // Color space conversion if necessary! int i; uint16 *buf = (uint16 *)_buf; diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h index e221753a47..bec33183c6 100644 --- a/engines/tony/gfxcore.h +++ b/engines/tony/gfxcore.h @@ -272,7 +272,7 @@ public: /** - * Task that draws a coloured box + * Task that draws a colored box */ class RMGfxBox : public RMGfxTaskSetPrior { protected: @@ -312,7 +312,7 @@ public: /** - * 16-bit colour source + * 16-bit color source */ class RMGfxSourceBuffer16 : public RMGfxSourceBuffer { protected: @@ -358,7 +358,7 @@ public: /** - * Buffer source with a 256 colour palette + * Buffer source with a 256 color palette */ class RMGfxSourceBuffer8 : public RMGfxSourceBufferPal { protected: @@ -378,7 +378,7 @@ public: /** - * Buffer source with a 256 colour palette, and alpha blending + * Buffer source with a 256 color palette, and alpha blending */ class RMGfxSourceBuffer8AB : public RMGfxSourceBuffer8 { protected: @@ -391,7 +391,7 @@ public: /** - * Buffer source with a 256 colour palette, RLE compressed + * Buffer source with a 256 color palette, RLE compressed */ class RMGfxSourceBuffer8RLE : public virtual RMGfxSourceBuffer8 { @@ -528,7 +528,7 @@ public: /** - * Source buffer with 16 colours + * Source buffer with 16 colors */ class RMGfxSourceBuffer4 : public RMGfxSourceBufferPal { public: diff --git a/engines/tony/gfxengine.cpp b/engines/tony/gfxengine.cpp index 9dab3eeb52..bb48be11c4 100644 --- a/engines/tony/gfxengine.cpp +++ b/engines/tony/gfxengine.cpp @@ -497,21 +497,21 @@ void RMGfxEngine::init() { // Create the freeze event _csMainLoop = g_system->createMutex(); - // Initialise the IRQ function for items for MPAL + // Initialize the IRQ function for items for MPAL GLOBALS._gfxEngine = this; mpalInstallItemIrq(itemIrq); - // Initialise the input + // Initialize the input _input.init(); - // Initialise the mouse pointer + // Initialize the mouse pointer _point.init(); - // Initialise Tony + // Initialize Tony _tony.init(); _tony.linkToBoxes(&_vm->_theBoxes); - // Initialise the inventory and the interface + // Initialize the inventory and the interface _inv.init(); _inter.init(); diff --git a/engines/tony/gfxengine.h b/engines/tony/gfxengine.h index 18c13d8d3d..9cc586d25d 100644 --- a/engines/tony/gfxengine.h +++ b/engines/tony/gfxengine.h @@ -86,7 +86,7 @@ public: // Draw the next frame void doFrame(CORO_PARAM, bool bDrawLocation); - // Initialises the graphics engine + // Initializes the graphics engine void init(); // Closes the graphics engine diff --git a/engines/tony/inventory.cpp b/engines/tony/inventory.cpp index 4d824bb10a..7b111f8f58 100644 --- a/engines/tony/inventory.cpp +++ b/engines/tony/inventory.cpp @@ -99,7 +99,7 @@ void RMInventory::init(void) { assert(res.isValid()); - // Initialise the MPAL inventory item by reading it in. + // Initialize the MPAL inventory item by reading it in. _items[i]._icon.setInitCurPattern(false); ds.openBuffer(res); ds >> _items[i]._icon; diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp index d36c004baf..d92b28845b 100644 --- a/engines/tony/loc.cpp +++ b/engines/tony/loc.cpp @@ -614,7 +614,7 @@ void RMItem::readFromStream(RMDataStream &ds, bool bLOX) { _patterns[i].readFromStream(ds, false); } - // Initialise the current pattern + // Initialize the current pattern if (_bInitCurPattern) setPattern(mpalQueryItemPattern(_mpalCode)); @@ -2051,11 +2051,11 @@ bool RMLocation::load(RMDataStream &ds) { ds >> dimx >> dimy; _curScroll.set(0, 0); - // Read the colour mode + // Read the color mode ds >> cm; _cmode = (RMColorMode)cm; - // Initialise the source buffer and read the location + // Initialize the source buffer and read the location switch (_cmode) { case CM_256: _buf = new RMGfxSourceBuffer8; @@ -2070,7 +2070,7 @@ bool RMLocation::load(RMDataStream &ds) { break; }; - // Initialise the surface, loading the palette if necessary + // Initialize the surface, loading the palette if necessary _buf->init(ds, dimx, dimy, true); // Check the size of the location @@ -2117,7 +2117,7 @@ bool RMLocation::loadLOX(RMDataStream &ds) { _cmode = CM_65K; _buf = new RMGfxSourceBuffer16; - // Initialise the surface, loading in the palette if necessary + // Initialize the surface, loading in the palette if necessary _buf->init(ds, dimx, dimy, true); // Number of items diff --git a/engines/tony/loc.h b/engines/tony/loc.h index ac0bb1d69a..b863a3af1b 100644 --- a/engines/tony/loc.h +++ b/engines/tony/loc.h @@ -42,7 +42,7 @@ namespace Tony { \****************************************************************************/ /** - * Valid colour modes + * Valid color modes */ typedef enum { CM_256, diff --git a/engines/tony/mpal/loadmpc.cpp b/engines/tony/mpal/loadmpc.cpp index b589827a5a..1ec921dbd4 100644 --- a/engines/tony/mpal/loadmpc.cpp +++ b/engines/tony/mpal/loadmpc.cpp @@ -334,7 +334,7 @@ static const byte *parseDialog(const byte *lpBuf, LPMPALDIALOG lpmdDialog) { * data of the item. * @returns Pointer to the buffer after the item, or NULL on failure. * @remarks It's necessary that the structure that is passed has been - * completely initialised to 0 beforehand. + * completely initialized to 0 beforehand. */ static const byte *parseItem(const byte *lpBuf, LPMPALITEM lpmiItem) { byte len; diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp index 07042ec077..bb3df1662f 100644 --- a/engines/tony/mpal/mpal.cpp +++ b/engines/tony/mpal/mpal.cpp @@ -838,7 +838,7 @@ void LocationPollThread(CORO_PARAM, const void *param) { CORO_BEGIN_CODE(_ctx); - /* Initialise data pointers */ + /* Initialize data pointers */ _ctx->MyActions = NULL; _ctx->MyThreads = NULL; @@ -1404,7 +1404,7 @@ bool doSelection(uint32 i, uint32 dwData) { //@{ /** - * Initialises the MPAL library and opens the .MPC file, which will be used for all queries. + * Initializes the MPAL library and opens the .MPC file, which will be used for all queries. * * @param lpszMpcFileName Name of the MPC file * @param lpszMprFileName Name of the MPR file diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp index 654a3f8222..c2f3cc4c89 100644 --- a/engines/tony/tony.cpp +++ b/engines/tony/tony.cpp @@ -107,7 +107,7 @@ Common::Error TonyEngine::run() { } /** - * Initialise the game + * Initialize the game */ Common::ErrorCode TonyEngine::init() { if (isCompressed()) { @@ -135,10 +135,10 @@ Common::ErrorCode TonyEngine::init() { // Reset the scheduler CoroScheduler.reset(); - // Initialise the graphics window + // Initialize the graphics window _window.init(); - // Initialise the function list + // Initialize the function list Common::fill(_funcList, _funcList + 300, (LPCUSTOMFUNCTION)NULL); initCustomFunctionMap(); @@ -151,17 +151,17 @@ Common::ErrorCode TonyEngine::init() { if (!mpalInit("ROASTED.MPC", "ROASTED.MPR", _funcList, _funcListStrings)) return Common::kUnknownError; - // Initialise the update resources + // Initialize the update resources _resUpdate.init("ROASTED.MPU"); - // Initialise the music + // Initialize the music initMusic(); - // Initialise the voices database + // Initialize the voices database if (!openVoiceDatabase()) return Common::kReadingFailed; - // Initialise the boxes + // Initialize the boxes _theBoxes.init(); // Link to the custom graphics engine diff --git a/engines/tony/tonychar.h b/engines/tony/tonychar.h index 203d391fbe..507ff28f6b 100644 --- a/engines/tony/tonychar.h +++ b/engines/tony/tonychar.h @@ -362,7 +362,7 @@ public: static void initStatics(); RMTony(); - // Initialise Tony + // Initialize Tony void init(void); // Free all memory diff --git a/engines/tony/utils.h b/engines/tony/utils.h index 33e2db7d7e..4b0074f94c 100644 --- a/engines/tony/utils.h +++ b/engines/tony/utils.h @@ -293,7 +293,7 @@ public: bool operator==(const RMRect &rc); bool operator!=(const RMRect &rc); - // Normalise + // Normalize void normalizeRect(); // Point in rect diff --git a/engines/tony/window.cpp b/engines/tony/window.cpp index 3b60e480f6..dd7c70fe19 100644 --- a/engines/tony/window.cpp +++ b/engines/tony/window.cpp @@ -49,7 +49,7 @@ RMWindow::~RMWindow() { } /** - * Initialises the graphics window + * Initializes the graphics window */ void RMWindow::init() { Graphics::PixelFormat pixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); |