From: <ave...@us...> - 2008-09-30 17:30:57
|
Revision: 5372 http://gemrb.svn.sourceforge.net/gemrb/?rev=5372&view=rev Author: avenger_teambg Date: 2008-09-30 17:30:41 +0000 (Tue, 30 Sep 2008) Log Message: ----------- msvc6 compatibility Modified Paths: -------------- gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.cpp Modified: gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.cpp 2008-09-28 18:12:50 UTC (rev 5371) +++ gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.cpp 2008-09-30 17:30:41 UTC (rev 5372) @@ -578,9 +578,9 @@ } Sprite2D* SDLVideoDriver::CreateSpriteBAM8(int w, int h, bool rle, - const unsigned char* pixeldata, - AnimationFactory* datasrc, - Palette* palette, int transindex) + const unsigned char* pixeldata, + AnimationFactory* datasrc, + Palette* palette, int transindex) { Sprite2D* spr = new Sprite2D(); spr->BAM = true; @@ -646,10 +646,10 @@ newpixels, tmp->format->palette->colors, true, 0); SDL_UnlockSurface( tmp ); } else { - Sprite2D_BAM_Internal* data = (Sprite2D_BAM_Internal*)sprite->vptr; - const Uint8* rledata; + Sprite2D_BAM_Internal* data = (Sprite2D_BAM_Internal*) sprite->vptr; + const unsigned char * rledata; - rledata = (const Uint8*)sprite->pixels; + rledata = (const unsigned char*) sprite->pixels; dest = CreateSpriteBAM8(sprite->Width, sprite->Height, data->RLE, rledata, data->source, data->pal, @@ -1570,7 +1570,7 @@ memcpy( &val, pixels, disp->format->BytesPerPixel ); SDL_UnlockSurface( backBuf ); - SDL_GetRGBA( val, backBuf->format, &color->r, &color->g, &color->b, &color->a ); + SDL_GetRGBA( val, backBuf->format, (Uint8 *) &color->r, (Uint8 *) &color->g, (Uint8 *) &color->b, (Uint8 *) &color->a ); } Color SDLVideoDriver::SpriteGetPixel(Sprite2D* sprite, unsigned short x, unsigned short y) @@ -1589,7 +1589,7 @@ memcpy( &val, pixels, surf->format->BytesPerPixel ); SDL_UnlockSurface( surf ); - SDL_GetRGBA( val, surf->format, &c.r, &c.g, &c.b, &c.a ); + SDL_GetRGBA( val, surf->format, (Uint8 *) &c.r, (Uint8 *) &c.g, (Uint8 *) &c.b, (Uint8 *) &c.a ); } else { Sprite2D_BAM_Internal* data = (Sprite2D_BAM_Internal*)sprite->vptr; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |