From 904f7646284e8784b94d290d063e6071821007a1 Mon Sep 17 00:00:00 2001 From: Frank Zago Date: Fri, 6 Aug 2010 02:47:43 +0000 Subject: [PATCH] Compile and warning fixes. --- client/SDL_Extensions.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/client/SDL_Extensions.cpp b/client/SDL_Extensions.cpp index 1a67b212a..2d2a2fe92 100644 --- a/client/SDL_Extensions.cpp +++ b/client/SDL_Extensions.cpp @@ -1014,11 +1014,10 @@ int CSDL_Ext::blit8bppAlphaTo24bpp(const SDL_Surface * src, const SDL_Rect * src g8 = (g5 << (8 - gbit)) | (g5 >> (2*gbit - 8)), b8 = (b5 << (8 - bbit)) | (b5 >> (2*bbit - 8)); - - ColorPutter<2, 0>::PutColor((Uint8*)p, - ((r8-tbc.r)*tbc.unused) >> 8 + tbc.r, - ((g8-tbc.g)*tbc.unused) >> 8 + tbc.g, - ((b8-tbc.b)*tbc.unused) >> 8 + tbc.b); + ColorPutter<2, 0>::PutColor(p, + (((r8-tbc.r)*tbc.unused) >> 8) + tbc.r, + (((g8-tbc.g)*tbc.unused) >> 8) + tbc.g, + (((b8-tbc.b)*tbc.unused) >> 8) + tbc.b); break; } }