fixed issue where windowsed mode in sdl was always 32 bpp

changelog.txt

@@ -1,5 +1,6 @@
 ---version 2.0.3 yet to be released---
-
+21-aug-2008 - punkrockguy318 - sdl - fixed issue where windowed mode would
+always be set to 32 bpp
 18-aug-2008 - zeromus - windows - SF [ 2058942 ] Load state as... does not use the savestate override dir (fixed; now, it does)
 18-aug-2008 - zeromus - windows - permit user optionally to proceed through the movie savestate mismatch error condition, in case he knows what he is doing.
 18-aug-2008 - zeromus - fix a bug in the savestate recovery code which prevent aborted savestate loads from recovering emulator state correctly.

src/drivers/sdl/sdl-video.cpp

@@ -159,7 +159,7 @@ InitVideo(FCEUGI *gi)
 
 
     // check for OpenGL and set the global flags
-#ifdef OPENGL
+#if OPENGL
     if(s_useOpenGL && !s_sponge) {
         flags = SDL_OPENGL;
     }
@@ -293,8 +293,8 @@ InitVideo(FCEUGI *gi)
             return -1;
         }
     } else {
-        // not fullscreen
-        int desbpp = 0;
+        int desbpp;
+        g_config->getOption("SDL.BitsPerPixel", &desbpp);
 
         g_config->getOption("SDL.XScale", &s_exs);
         g_config->getOption("SDL.YScale", &s_eys);
@@ -307,12 +307,6 @@ InitVideo(FCEUGI *gi)
                 s_exs = s_eys = 2;
             }
             s_eefx = 0;
-
-            // XXX soules - no clue what below comment is from
-            // SDL's 32bpp->16bpp code is slighty faster than mine, at least :/
-            if(s_sponge == 1 || s_sponge == 3) {
-                desbpp = 32;
-            }
         }
 
 #ifdef OPENGL
@@ -371,7 +365,7 @@ InitVideo(FCEUGI *gi)
     if(gi->name) {
         SDL_WM_SetCaption((const char *)gi->name, (const char *)gi->name);
     } else {
-        SDL_WM_SetCaption("FCE Ultra","FCE Ultra");
+        SDL_WM_SetCaption("FCE UltraX","FCE Ultra");
     }
 
     // create the surface for displaying graphical messages

src/drivers/sdl/sdl.cpp

@@ -442,9 +442,9 @@ SDL_GL_LoadLibrary(0);
         return -1;
     }
 
-	// This is here so that a default fceux.cfg will be created on first
-	// run, even without a valid ROM to play.
-	g_config->save();
+	  // This is here so that a default fceux.cfg will be created on first
+	  // run, even without a valid ROM to play.
+	  g_config->save();
 
 
     // update the input devices