diff options
| author | Filippos Karapetis | 2009-06-06 10:40:32 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-06-06 10:40:32 +0000 |
| commit | 26b03dd359e28ebb058a6c8d1cd2773ebd4a8ab2 (patch) | |
| tree | ee71281e778f326830a48949802cfd06e59c0a04 /engines/sci/gfx/operations.cpp | |
| parent | be414833733fb5754b11bb7777f9a8e1a0c168f4 (diff) | |
| download | scummvm-rg350-26b03dd359e28ebb058a6c8d1cd2773ebd4a8ab2.tar.gz scummvm-rg350-26b03dd359e28ebb058a6c8d1cd2773ebd4a8ab2.tar.bz2 scummvm-rg350-26b03dd359e28ebb058a6c8d1cd2773ebd4a8ab2.zip | |
Some uint8 -> byte conversions
svn-id: r41216
Diffstat (limited to 'engines/sci/gfx/operations.cpp')
| -rw-r--r-- | engines/sci/gfx/operations.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index 2ffdf5056e..cb73771528 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -206,7 +206,7 @@ static int _gfxop_install_pixmap(GfxDriver *driver, gfx_pixmap_t *pxm) { // TODO: We probably want to only update the colours used by this pixmap // here. This will require updating the 'dirty' system. - uint8 paletteData[4*256]; + byte paletteData[4*256]; const uint paletteSize = driver->getMode()->palette->size(); for (uint i = 0; i < paletteSize; ++i) { const PaletteEntry& c = (*driver->getMode()->palette)[i]; @@ -989,17 +989,17 @@ int gfxop_draw_box(GfxState *state, rect_t box, gfx_color_t color1, gfx_color_t draw_color1.priority = draw_color2.priority = color1.priority; if (draw_color1.mask & GFX_MASK_VISUAL) { - draw_color1.visual.r = (uint8) COLOR_MIX(visual.r, mod_offset); - draw_color1.visual.g = (uint8) COLOR_MIX(visual.g, mod_offset); - draw_color1.visual.b = (uint8) COLOR_MIX(visual.b, mod_offset); - draw_color1.alpha = (uint8) COLOR_MIX(alpha, mod_offset); + draw_color1.visual.r = (byte) COLOR_MIX(visual.r, mod_offset); + draw_color1.visual.g = (byte) COLOR_MIX(visual.g, mod_offset); + draw_color1.visual.b = (byte) COLOR_MIX(visual.b, mod_offset); + draw_color1.alpha = (byte) COLOR_MIX(alpha, mod_offset); mod_offset += mod_breadth; - draw_color2.visual.r = (uint8) COLOR_MIX(visual.r, mod_offset); - draw_color2.visual.g = (uint8) COLOR_MIX(visual.g, mod_offset); - draw_color2.visual.b = (uint8) COLOR_MIX(visual.b, mod_offset); - draw_color2.alpha = (uint8) COLOR_MIX(alpha, mod_offset); + draw_color2.visual.r = (byte) COLOR_MIX(visual.r, mod_offset); + draw_color2.visual.g = (byte) COLOR_MIX(visual.g, mod_offset); + draw_color2.visual.b = (byte) COLOR_MIX(visual.b, mod_offset); + draw_color2.alpha = (byte) COLOR_MIX(alpha, mod_offset); } if (reverse) return drv->drawFilledRect(new_box, draw_color2, draw_color1, driver_shade_type); |