diff options
Diffstat (limited to 'engines/tony')
-rw-r--r-- | engines/tony/custom.cpp | 6 | ||||
-rw-r--r-- | engines/tony/font.cpp | 2 | ||||
-rw-r--r-- | engines/tony/gfxcore.cpp | 2 | ||||
-rw-r--r-- | engines/tony/inventory.cpp | 2 | ||||
-rw-r--r-- | engines/tony/loc.cpp | 4 | ||||
-rw-r--r-- | engines/tony/mpal/mpalutils.cpp | 2 | ||||
-rw-r--r-- | engines/tony/mpal/mpalutils.h | 2 | ||||
-rw-r--r-- | engines/tony/tony.cpp | 6 | ||||
-rw-r--r-- | engines/tony/window.cpp | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp index 7bca40b850..23c655e35a 100644 --- a/engines/tony/custom.cpp +++ b/engines/tony/custom.cpp @@ -72,9 +72,9 @@ static const MusicFileEntry kMusicFiles[] = { static const char *const kJingleFileNames[] = { - "S00.ADP", "S01.ADP", "S02.ADP", "S03.ADP", "S04.ADP", - "S05.ADP", "S06.ADP", "S07.ADP", "S08.ADP", "S09.ADP", - "S10.ADP", "S11.ADP", "S12.ADP", "S13.ADP", "S14.ADP", + "S00.ADP", "S01.ADP", "S02.ADP", "S03.ADP", "S04.ADP", + "S05.ADP", "S06.ADP", "S07.ADP", "S08.ADP", "S09.ADP", + "S10.ADP", "S11.ADP", "S12.ADP", "S13.ADP", "S14.ADP", "S15.ADP", "S16.ADP", "S17.ADP", "S18.ADP" }; diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp index c8919dbdb5..fa018b4464 100644 --- a/engines/tony/font.cpp +++ b/engines/tony/font.cpp @@ -925,7 +925,7 @@ RMDialogChoice::RMDialogChoice() { _hUnreg = CoroScheduler.createEvent(false, false); _bRemoveFromOT = false; - + _curAdded = 0; _bShow = false; } diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp index 25ea10d417..04ce01b0ed 100644 --- a/engines/tony/gfxcore.cpp +++ b/engines/tony/gfxcore.cpp @@ -361,7 +361,7 @@ void RMGfxTargetBuffer::addPrim(RMGfxPrimitive *prim) { void RMGfxTargetBuffer::addDirtyRect(const Common::Rect &r) { assert(r.isValidRect()); if (_trackDirtyRects && r.width() > 0 && r.height() > 0) - _currentDirtyRects.push_back(r); + _currentDirtyRects.push_back(r); } Common::List<Common::Rect> &RMGfxTargetBuffer::getDirtyRects() { diff --git a/engines/tony/inventory.cpp b/engines/tony/inventory.cpp index d758c3ff74..12540e5b7f 100644 --- a/engines/tony/inventory.cpp +++ b/engines/tony/inventory.cpp @@ -711,7 +711,7 @@ int RMInventory::loadState(byte *state) { _curPos = 0; _bCombining = false; - + _items[29]._icon.setPattern(1); if (_nInv > 8) diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp index 665afa9180..18470aa6fc 100644 --- a/engines/tony/loc.cpp +++ b/engines/tony/loc.cpp @@ -668,7 +668,7 @@ void RMItem::setPattern(int nPattern, bool bPlayP0) { if (_nCurPattern > 0) _patterns[_nCurPattern].stopSfx(_sfx); } - + // Remember the current pattern _nCurPattern = nPattern; @@ -1661,7 +1661,7 @@ RMCharacter::RMCharacter() { _bMovingWithoutMinpath = false; _bDrawNow = false; _bNeedToStop = false; - + memset(_path, 0, sizeof(_path)); _pos.set(0, 0); diff --git a/engines/tony/mpal/mpalutils.cpp b/engines/tony/mpal/mpalutils.cpp index 92d4af37fc..0919aed5ac 100644 --- a/engines/tony/mpal/mpalutils.cpp +++ b/engines/tony/mpal/mpalutils.cpp @@ -81,7 +81,7 @@ Common::SeekableReadStream *RMRes::getReadStream() { } bool RMRes::isValid() { - return _h != NULL; + return _h != NULL; } /****************************************************************************\ diff --git a/engines/tony/mpal/mpalutils.h b/engines/tony/mpal/mpalutils.h index 629e157e29..d92bb6f9a2 100644 --- a/engines/tony/mpal/mpalutils.h +++ b/engines/tony/mpal/mpalutils.h @@ -59,7 +59,7 @@ class RMResRaw : public RMRes { public: RMResRaw(uint32 resID); virtual ~RMResRaw(); - + const byte *dataPointer(); operator const byte*(); diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp index 710fe7ca68..695801ad90 100644 --- a/engines/tony/tony.cpp +++ b/engines/tony/tony.cpp @@ -244,16 +244,16 @@ bool TonyEngine::loadTonyDat() { expectedLangVariant = 0; break; } - + int numVariant = in.readUint16BE(); if (expectedLangVariant > numVariant) { msg = Common::String::format("Font variant not present in 'tony.dat'. Get it from the ScummVM website"); GUIErrorMessage(msg); warning("%s", msg.c_str()); - + return false; } - + in.seek(in.pos() + (2 * 256 * 8 * expectedLangVariant)); for (int i = 0; i < 256; i++) { _cTableDialog[i] = in.readSint16BE(); diff --git a/engines/tony/window.cpp b/engines/tony/window.cpp index 013be84b4b..c9c450424f 100644 --- a/engines/tony/window.cpp +++ b/engines/tony/window.cpp @@ -256,7 +256,7 @@ void RMWindow::plotLines(const byte *lpBuf, const Common::Point ¢er, int x, } void RMWindow::showDirtyRects(bool v) { - _showDirtyRects = v; + _showDirtyRects = v; } /****************************************************************************\ |