diff options
| author | Martin Kiewitz | 2010-05-24 21:47:06 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-05-24 21:47:06 +0000 |
| commit | 830d17ed318d62a01aa1ec24ec79a7439586eb5e (patch) | |
| tree | 934031cd59304798a9e528d24c205e617fd38bdb /engines/sci/graphics | |
| parent | d4ae096a633182c1a6a85061909c26a33a929460 (diff) | |
| download | scummvm-rg350-830d17ed318d62a01aa1ec24ec79a7439586eb5e.tar.gz scummvm-rg350-830d17ed318d62a01aa1ec24ec79a7439586eb5e.tar.bz2 scummvm-rg350-830d17ed318d62a01aa1ec24ec79a7439586eb5e.zip | |
SCI: renaming MacIconBar to GfxMacIconBar
svn-id: r49202
Diffstat (limited to 'engines/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/maciconbar.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/graphics/maciconbar.h | 6 | ||||
| -rw-r--r-- | engines/sci/graphics/palette.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/graphics/maciconbar.cpp b/engines/sci/graphics/maciconbar.cpp index b2a0b0677d..2904bda22b 100644 --- a/engines/sci/graphics/maciconbar.cpp +++ b/engines/sci/graphics/maciconbar.cpp @@ -36,11 +36,11 @@ namespace Sci { -void MacIconBar::addIcon(reg_t obj) { +void GfxMacIconBar::addIcon(reg_t obj) { _iconBarObjects.push_back(obj); } -void MacIconBar::drawIcons() { +void GfxMacIconBar::drawIcons() { // Draw the icons to the bottom of the screen byte *pal = new byte[256 * 4]; @@ -69,7 +69,7 @@ void MacIconBar::drawIcons() { delete[] pal; } -void MacIconBar::remapColors(Graphics::Surface *surf, byte *palette) { +void GfxMacIconBar::remapColors(Graphics::Surface *surf, byte *palette) { byte *pixels = (byte *)surf->pixels; // Remap to the screen palette diff --git a/engines/sci/graphics/maciconbar.h b/engines/sci/graphics/maciconbar.h index a9f1fe0243..71e65fcb40 100644 --- a/engines/sci/graphics/maciconbar.h +++ b/engines/sci/graphics/maciconbar.h @@ -36,10 +36,10 @@ namespace Graphics { namespace Sci { -class MacIconBar { +class GfxMacIconBar { public: - MacIconBar() {} - ~MacIconBar() {} + GfxMacIconBar() {} + ~GfxMacIconBar() {} void addIcon(reg_t obj); void drawIcons(); diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 841202abce..ab96856674 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -314,8 +314,8 @@ void GfxPalette::setOnScreen() { _screen->setPalette(&_sysPalette); // Redraw the Mac SCI1.1 Icon bar every palette change - if (g_sci->_macIconBar) - g_sci->_macIconBar->drawIcons(); + if (g_sci->_gfxMacIconBar) + g_sci->_gfxMacIconBar->drawIcons(); } bool GfxPalette::kernelSetFromResource(GuiResourceId resourceId, bool force) { |