cleanup of warning messages if setting up SDL 1.2 video mode failed

[rocksndiamonds.git] / src / libgame / system.h

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 7e6bcc1f812150d0d2ea611f80951871f5be0b85..593b245010806f0224515685d3cfd9ba135845f9 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -172,6 +172,8 @@
 /* values for drawing target for global border */
 #define DRAW_BORDER_TO_BACKBUFFER      0
 #define DRAW_BORDER_TO_SCREEN          1
+#define DRAW_BORDER_TO_FADE_SOURCE     2
+#define DRAW_BORDER_TO_FADE_TARGET     3
 
 /* values for move directions and special "button" key bitmasks */
 #define MV_NONE                        0
@@ -707,7 +709,6 @@ struct ProgramInfo
 
 struct OptionInfo
 {
-  char *display_name;
   char *server_host;
   int server_port;
 
@@ -729,11 +730,6 @@ struct OptionInfo
   boolean debug;
 };
 
-struct ScreenModeInfo
-{
-  int width, height;
-};
-
 struct VideoSystemInfo
 {
   int default_depth;
@@ -743,8 +739,6 @@ struct VideoSystemInfo
   boolean fullscreen_available;
   boolean fullscreen_enabled;
   boolean fullscreen_initial;
-  struct ScreenModeInfo *fullscreen_modes;
-  char *fullscreen_mode_current;
 
   boolean window_scaling_available;
   int window_scaling_percent;
@@ -819,6 +813,8 @@ struct GfxInfo
   Bitmap *fade_bitmap_target;
   Bitmap *fade_bitmap_black;
 
+  int fade_border_source_status;
+  int fade_border_target_status;
   Bitmap *masked_border_bitmap_ptr;
 
 #if USE_FINAL_SCREEN_BITMAP
@@ -1008,7 +1004,6 @@ struct SetupInfo
   boolean skip_levels;
   boolean time_limit;
   boolean fullscreen;
-  char *fullscreen_mode;
   int window_scaling_percent;
   char *window_scaling_quality;
   boolean ask_on_escape;