diff options
Diffstat (limited to 'engines/tinsel/graphics.cpp')
| -rw-r--r-- | engines/tinsel/graphics.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/tinsel/graphics.cpp b/engines/tinsel/graphics.cpp index 6a5d626de8..9b06b1a501 100644 --- a/engines/tinsel/graphics.cpp +++ b/engines/tinsel/graphics.cpp @@ -40,7 +40,7 @@ namespace Tinsel { #define CHAR_WIDTH 4 #define CHAR_HEIGHT 4 -extern uint8 transPalette[MAX_COLORS]; +extern uint8 g_transPalette[MAX_COLORS]; //----------------- SUPPORT FUNCTIONS --------------------- @@ -67,7 +67,7 @@ uint8* psxPJCRLEUnwinder(uint16 imageWidth, uint16 imageHeight, uint8 *srcIdx) { // Calculate needed index numbers, align width and height not next multiple of four imageWidth = (imageWidth % 4) ? ((imageWidth / 4) + 1) * 4 : imageWidth; imageHeight = (imageHeight % 4) ? ((imageHeight / 4) + 1) * 4 : imageHeight; - destinationBuffer = (uint8*)malloc((imageWidth * imageHeight) / 8); + destinationBuffer = (uint8 *)malloc((imageWidth * imageHeight) / 8); dstIdx = destinationBuffer; remainingBlocks = (imageWidth * imageHeight) / 16; @@ -478,9 +478,9 @@ static void t2WrtNonZero(DRAWOBJECT *pObj, uint8 *srcP, uint8 *destP, bool apply // Non-transparent run length color += pObj->constant; if (horizFlipped) - Common::set_to(tempP - runLength + 1, tempP + 1, color); + Common::fill(tempP - runLength + 1, tempP + 1, color); else - Common::set_to(tempP, tempP + runLength, color); + Common::fill(tempP, tempP + runLength, color); } } @@ -533,7 +533,7 @@ static void WrtConst(DRAWOBJECT *pObj, uint8 *destP, bool applyClipping) { // Loop through any remaining lines while (pObj->height > 0) { - Common::set_to(destP, destP + pObj->width, pObj->constant); + Common::fill(destP, destP + pObj->width, pObj->constant); --pObj->height; destP += SCREEN_WIDTH; @@ -559,7 +559,7 @@ static void WrtTrans(DRAWOBJECT *pObj, uint8 *destP, bool applyClipping) { // Loop through any remaining lines while (pObj->height > 0) { for (int i = 0; i < pObj->width; ++i, ++destP) - *destP = transPalette[*destP]; + *destP = g_transPalette[*destP]; --pObj->height; destP += lineOffset; |