diff options
| author | Strangerke | 2012-06-06 08:31:06 +0200 |
|---|---|---|
| committer | Strangerke | 2012-06-06 08:31:06 +0200 |
| commit | 53e38106b73e6ad9e6f725857483bfd35e961326 (patch) | |
| tree | 050863c3abfbeff77e661a8cdc8109dec767a712 /engines/tony/font.cpp | |
| parent | f1ac5d5acdbc0349850377619d8056be22871b42 (diff) | |
| download | scummvm-rg350-53e38106b73e6ad9e6f725857483bfd35e961326.tar.gz scummvm-rg350-53e38106b73e6ad9e6f725857483bfd35e961326.tar.bz2 scummvm-rg350-53e38106b73e6ad9e6f725857483bfd35e961326.zip | |
TONY: Rename variables and functions in inventory.h
That fixes the regression in the credits
Diffstat (limited to 'engines/tony/font.cpp')
| -rw-r--r-- | engines/tony/font.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp index e967f38199..bc32939061 100644 --- a/engines/tony/font.cpp +++ b/engines/tony/font.cpp @@ -157,10 +157,9 @@ RMFontColor::RMFontColor() : RMFont() { } RMFontColor::~RMFontColor() { - } -void RMFontColor::SetBaseColor(byte r1, byte g1, byte b1) { +void RMFontColor::setBaseColor(byte r1, byte g1, byte b1) { int r = (int)r1 << 16; int g = (int)g1 << 16; int b = (int)b1 << 16; @@ -1832,7 +1831,7 @@ void RMText::writeText(const RMString &text, RMFontColor *font, int *time) { int numlines; // Set the base colour - font->SetBaseColor(m_r, m_g, m_b); + font->setBaseColor(m_r, m_g, m_b); // Destroy the buffer before starting destroy(); @@ -2244,8 +2243,8 @@ void RMTextItemName::doFrame(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMLocation & _curscroll = loc.ScrollPosition(); // Check if we are on the inventory - if (inv.ItemInFocus(_mpos)) - _item = inv.WhichItemIsIn(_mpos); + if (inv.itemInFocus(_mpos)) + _item = inv.whichItemIsIn(_mpos); else _item = loc.WhichItemIsIn(_mpos); |