actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Always convert; see comment.

Browse Source
This commit is contained in:
Glenn Maynard
2002-11-05 02:51:14 +00:00
parent 22808e1a0b
commit 9706589170
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SDL_utils.cpp
+6 -2
View File
@@ -150,14 +150,18 @@ void ConvertSDLSurface(SDL_Surface *&image,
ASSERT(ret_image != NULL); ASSERT(ret_image != NULL);
/* If the formats are the same, no conversion is needed. */ /* If the formats are the same, no conversion is needed. */
if(width == image->w && height == image->h && /* if(width == image->w && height == image->h &&
!memcmp(image->format, ret_image->format, sizeof(SDL_PixelFormat))) !memcmp(image->format, ret_image->format, sizeof(SDL_PixelFormat)))
{ {
SDL_FreeSurface(ret_image); SDL_FreeSurface(ret_image);
return; return;
} }
if(!(image->flags & SDL_SRCCOLORKEY)) // XXX until HOT PINK color keys are gone It's needed because of the color key; the blit converts it to alpha. (Gah.) */
/* I'd really like to do away with this, but a lot of song images use it.
* I suppose this should be yet another hint, but they're getting cumbersome ... */
if(!(image->flags & SDL_SRCCOLORKEY))
SDL_SetColorKey( image, SDL_SRCCOLORKEY, SDL_MapRGB(image->format, 0xFF, 0, 0xFF)); SDL_SetColorKey( image, SDL_SRCCOLORKEY, SDL_MapRGB(image->format, 0xFF, 0, 0xFF));
/* We don't want to actually blend the alpha channel over the destination converted /* We don't want to actually blend the alpha channel over the destination converted