remove remnants of SDL1

Fixes fabiangreffrath#25,

extravbls is still evailable through the debug menu if ever needed.

Author: fabiangreffrath

README.txt

@@ -121,14 +121,6 @@ Wolf4SDL supports the following command line options:
                         (must be multiple of 320x200 or 320x240)
  --resf <w> <h>         Sets any screen resolution >= 320x200
                         (which may result in graphic errors)
- --bits <b>             Sets the screen color depth
-                        (Use this when you have palette/fading problem
-                        or perhaps to optimize speed on old systems.
-                        Allowed: 8, 16, 24, 32, default: "best" depth)
- --nodblbuf             Don't use SDL's double buffering
- --extravbls <vbls>     Sets a delay after each frame, which may help to
-                        reduce flickering (SDL does not support vsync...)
-                        (unit is currently 8 ms, default: 0)
  --joystick <index>     Use the index-th joystick if available
  --joystickhat <index>  Enables movement with the given coolie hat
  --samplerate <rate>    Sets the sound sample rate (given in Hz)

id_vh.cpp

@@ -425,18 +425,10 @@ boolean FizzleFade (SDL_Surface *source, int x1, int y1,
                     // copy one pixel
                     //
 
-                    if(screenBits == 8)
-                    {
-                        *(destptr + (y1 + y) * screen->pitch + x1 + x)
-                            = *(srcptr + (y1 + y) * source->pitch + x1 + x);
-                    }
-                    else
-                    {
                         byte col = *(srcptr + (y1 + y) * source->pitch + x1 + x);
                         uint32_t fullcol = SDL_MapRGB(screen->format, curpal[col].r, curpal[col].g, curpal[col].b);
                         memcpy(destptr + (y1 + y) * screen->pitch + (x1 + x) * screen->format->BytesPerPixel,
                             &fullcol, screen->format->BytesPerPixel);
-                    }
 
                     if(rndval == 0)		// entire sequence has been completed
                         goto finished;
@@ -446,7 +438,7 @@ boolean FizzleFade (SDL_Surface *source, int x1, int y1,
             }
 
             // If there is no double buffering, we always use the "first frame" case
-            if(usedoublebuffering) first = 0;
+            first = 0;
 
             VL_UnlockSurface(screen);
             VL_Flip();

id_vl.cpp

@@ -17,12 +17,10 @@
 
 boolean fullscreen = false;
 #if defined(_arch_dreamcast)
-boolean usedoublebuffering = false;
 unsigned screenWidth = 320;
 unsigned screenHeight = 200;
 int screenBits = 8;
 #elif defined(GP2X)
-boolean usedoublebuffering = true;
 unsigned screenWidth = 320;
 unsigned screenHeight = 240;
 #if defined(GP2X_940)
@@ -31,7 +29,6 @@ int screenBits = 8;
 int screenBits = 16;
 #endif
 #else
-boolean usedoublebuffering = true;
 unsigned screenWidth = 640;
 unsigned screenHeight = 400;
 int screenBits = -1;      // use "best" color depth according to libSDL
@@ -393,7 +390,6 @@ void VL_FadeOut (int start, int end, int red, int green, int blue, int steps)
 			newptr++;
 		}
 
-		if(!usedoublebuffering || screenBits == 8) VL_WaitVBL(1);
 		VL_SetPalette (palette2, true);
 	}
 
@@ -437,7 +433,6 @@ void VL_FadeIn (int start, int end, SDL_Color *palette, int steps)
 			palette2[j].b = palette1[j].b + delta * i / steps;
 		}
 
-		if(!usedoublebuffering || screenBits == 8) VL_WaitVBL(1);
 		VL_SetPalette(palette2, true);
 	}
 

id_vl.h

@@ -14,9 +14,8 @@ void Quit (const char *error,...);
 extern SDL_Window *window;
 extern SDL_Surface *screen, *screenBuffer, *curSurface;
 
-extern  boolean  fullscreen, usedoublebuffering;
+extern  boolean  fullscreen;
 extern  unsigned screenWidth, screenHeight, screenPitch, bufferPitch, curPitch;
-extern  int screenBits;
 extern  unsigned scaleFactor;
 
 extern	boolean  screenfaded;

wl_act2.cpp

@@ -2563,7 +2563,7 @@ void    A_StartDeathCam (objtype *ob)
         return;
     }
 
-    if(usedoublebuffering) VH_UpdateScreen();
+    VH_UpdateScreen();
 
     gamestate.victoryflag = true;
     unsigned fadeheight = viewsize != 21 ? screenHeight-scaleFactor*STATUSLINES : screenHeight;
@@ -2592,7 +2592,6 @@ void    A_StartDeathCam (objtype *ob)
     }
 
     VW_UpdateScreen ();
-    if(usedoublebuffering) VH_UpdateScreen();
 
     IN_UserInput(300);
 

wl_game.cpp

@@ -1123,7 +1123,7 @@ void RecordDemo (void)
     SetupGameLevel ();
     StartMusic ();
 
-    if(usedoublebuffering) VH_UpdateScreen();
+    VH_UpdateScreen();
     fizzlein = true;
 
     PlayLoop ();
@@ -1319,7 +1319,7 @@ void Died (void)
     //
     FinishPaletteShifts ();
 
-    if(usedoublebuffering) VH_UpdateScreen();
+    VH_UpdateScreen();
 
     VL_BarScaledCoord (viewscreenx,viewscreeny,viewwidth,viewheight,4);
 

wl_inter.cpp

@@ -672,7 +672,7 @@ LevelCompleted (void)
                 Write (x, 7, tempstr);
                 if (!(i % (PAR_AMOUNT / 10)))
                     SD_PlaySound (ENDBONUS1SND);
-                if(!usedoublebuffering || !(i % (PAR_AMOUNT / 50))) VW_UpdateScreen ();
+                if(!(i % (PAR_AMOUNT / 50))) VW_UpdateScreen ();
                 while(SD_SoundPlaying ())
                     BJ_Breathe ();
                 if (IN_CheckAck ())
@@ -703,7 +703,7 @@ LevelCompleted (void)
             Write (x, 14, tempstr);
             if (!(i % 10))
                 SD_PlaySound (ENDBONUS1SND);
-            if(!usedoublebuffering || !(i & 1)) VW_UpdateScreen ();
+            if(!(i & 1)) VW_UpdateScreen ();
             while (SD_SoundPlaying ())
                 BJ_Breathe ();
 
@@ -745,7 +745,7 @@ LevelCompleted (void)
             Write (x, 16, tempstr);
             if (!(i % 10))
                 SD_PlaySound (ENDBONUS1SND);
-            if(!usedoublebuffering || !(i & 1)) VW_UpdateScreen ();
+            if(!(i & 1)) VW_UpdateScreen ();
             while (SD_SoundPlaying ())
                 BJ_Breathe ();
 
@@ -786,7 +786,7 @@ LevelCompleted (void)
             Write (x, 18, tempstr);
             if (!(i % 10))
                 SD_PlaySound (ENDBONUS1SND);
-            if(!usedoublebuffering || !(i & 1)) VW_UpdateScreen ();
+            if(!(i & 1)) VW_UpdateScreen ();
             while (SD_SoundPlaying ())
                 BJ_Breathe ();
             if (IN_CheckAck ())

wl_main.cpp

@@ -1776,50 +1776,6 @@ void CheckParameters(int argc, char *argv[])
                     printf("Screen height must be at least 200!\n"), hasError = true;
             }
         }
-        else IFARG("--bits")
-        {
-            if(++i >= argc)
-            {
-                printf("The bits option is missing the color depth argument!\n");
-                hasError = true;
-            }
-            else
-            {
-                screenBits = atoi(argv[i]);
-                switch(screenBits)
-                {
-                    case 8:
-                    case 16:
-                    case 24:
-                    case 32:
-                        break;
-
-                    default:
-                        printf("Screen color depth must be 8, 16, 24, or 32!\n");
-                        hasError = true;
-                        break;
-                }
-            }
-        }
-        else IFARG("--nodblbuf")
-            usedoublebuffering = false;
-        else IFARG("--extravbls")
-        {
-            if(++i >= argc)
-            {
-                printf("The extravbls option is missing the vbls argument!\n");
-                hasError = true;
-            }
-            else
-            {
-                extravbls = atoi(argv[i]);
-                if(extravbls < 0)
-                {
-                    printf("Extravbls must be positive!\n");
-                    hasError = true;
-                }
-            }
-        }
         else IFARG("--joystick")
         {
             if(++i >= argc)
@@ -1929,12 +1885,6 @@ void CheckParameters(int argc, char *argv[])
             "                        (must be multiple of 320x200 or 320x240)\n"
             " --resf <w> <h>         Sets any screen resolution >= 320x200\n"
             "                        (which may result in graphic errors)\n"
-            " --bits <b>             Sets the screen color depth\n"
-            "                        (use this when you have palette/fading problems\n"
-            "                        allowed: 8, 16, 24, 32, default: \"best\" depth)\n"
-            " --nodblbuf             Don't use SDL's double buffering\n"
-            " --extravbls <vbls>     Sets a delay after each frame, which may help to\n"
-            "                        reduce flickering (unit is currently 8 ms, default: 0)\n"
             " --joystick <index>     Use the index-th joystick if available\n"
             "                        (-1 to disable joystick, default: 0)\n"
             " --joystickhat <index>  Enables movement with the given coolie hat\n"