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/gfx_driver.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/gfx_driver.cpp')
-rw-r--r-- | engines/sci/gfx/gfx_driver.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/gfx/gfx_driver.cpp b/engines/sci/gfx/gfx_driver.cpp index 96a14f63da..961eecc6fd 100644 --- a/engines/sci/gfx/gfx_driver.cpp +++ b/engines/sci/gfx/gfx_driver.cpp @@ -78,7 +78,7 @@ GfxDriver::~GfxDriver() { static void drawProc(int x, int y, int c, void *data) { GfxDriver *drv = (GfxDriver *)data; - uint8 *p = drv->getVisual0(); + byte *p = drv->getVisual0(); p[y * 320* drv->getMode()->xfact + x] = c; } @@ -224,7 +224,7 @@ int GfxDriver::setStaticBuffer(gfx_pixmap_t *pic, gfx_pixmap_t *priority) { byte *GfxDriver::createCursor(gfx_pixmap_t *pointer) { int linewidth = pointer->width; int lines = pointer->height; - byte *data = new uint8[linewidth*lines]; + byte *data = new byte[linewidth*lines]; byte *linebase = data, *pos; byte *src = pointer->index_data; @@ -232,7 +232,7 @@ byte *GfxDriver::createCursor(gfx_pixmap_t *pointer) { pos = linebase; for (int xc = 0; xc < pointer->index_width; xc++) { - uint8 color = *src; + byte color = *src; // FIXME: The palette size check is a workaround for cursors using non-palette colour GFX_CURSOR_TRANSPARENT // Note that some cursors don't have a palette in SQ5 if (pointer->palette && color < pointer->palette->size()) @@ -254,11 +254,11 @@ int GfxDriver::setPointer(gfx_pixmap_t *pointer, Common::Point *hotspot) { if ((pointer == NULL) || (hotspot == NULL)) { g_system->showMouse(false); } else { - uint8 *cursorData = createCursor(pointer); + byte *cursorData = createCursor(pointer); // FIXME: The palette size check is a workaround for cursors using non-palette colour GFX_CURSOR_TRANSPARENT // Note that some cursors don't have a palette in SQ5 - uint8 color_key = GFX_CURSOR_TRANSPARENT; + byte color_key = GFX_CURSOR_TRANSPARENT; if ((pointer->color_key != GFX_PIXMAP_COLOR_KEY_NONE) && (pointer->palette && (unsigned int)pointer->color_key < pointer->palette->size())) color_key = pointer->palette->getColor(pointer->color_key).parent_index; // Some cursors in SQ5 don't have a palette. The cursor palette seems to use 64 colors, so setting the color key to 63 works |