diff --git a/stepmania/src/SDL_utils.cpp b/stepmania/src/SDL_utils.cpp index 11289e5d0e..2f994a240b 100644 --- a/stepmania/src/SDL_utils.cpp +++ b/stepmania/src/SDL_utils.cpp @@ -588,7 +588,10 @@ void mySDL_WM_SetIcon( CString sIconFile ) } SDL_Surface *srf = IMG_Load(sIconFile); - SDL_SetColorKey( srf, SDL_SRCCOLORKEY, SDL_MapRGB(srf->format, 0xFF, 0, 0xFF)); + + // Why is this needed? It's goofing up paletted images + // that use a color key other than pink. -Chris + // SDL_SetColorKey( srf, SDL_SRCCOLORKEY, SDL_MapRGB(srf->format, 0xFF, 0, 0xFF)); /* Windows icons are 32x32 and SDL can't resize them for us, which * causes mask corruption. (Actually, the above icon *is* 32x32; diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp index f230561c66..1695cf824d 100644 --- a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp +++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp @@ -14,7 +14,7 @@ LoadingWindow_SDL::LoadingWindow_SDL() RageException::Throw( "Couldn't initialize SDL: %s\n", SDL_GetError() ); /* Set window title and icon */ - SDL_WM_SetCaption("StepMania", "StepMania"); + SDL_WM_SetCaption("Loading StepMania", ""); SDL_Surface *srf = IMG_ReadXPMFromArray(icon); SDL_SetColorKey( srf, SDL_SRCCOLORKEY, SDL_MapRGB(srf->format, 0xFF, 0, 0xFF)); diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp index 6693f317c9..cb1e49ded6 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp @@ -133,7 +133,6 @@ bool LowLevelWindow_SDL::TryVideoMode( RageDisplay::VideoModeParams p, bool &bNe // NewOpenGLContext = true; // } - SDL_WM_SetCaption("StepMania", "StepMania"); // mySDL_EventState(SDL_OPENGLRESET, SDL_IGNORE); #endif