rnd-20140103-2-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 8c38785210b777bfdcb744723d2b1faf4a1d25a4..2392bcf0a159648444733d651b82ce164d379e61 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -2969,9 +2969,16 @@ void DrawInfoScreen_Version()
 #if defined(TARGET_SDL)
   int xstart3 = mSX + 29 * xstep;
   SDL_version sdl_version_compiled;
+#if defined(TARGET_SDL2)
+  SDL_version sdl_version_linked_ext;
+#endif
   const SDL_version *sdl_version_linked;
+#if defined(TARGET_SDL2)
+  const char *driver_name = NULL;
+#else
   int driver_name_len = 8;
   char driver_name[driver_name_len];
+#endif
 #endif
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
@@ -3011,7 +3018,12 @@ void DrawInfoScreen_Version()
   DrawTextF(xstart3, ystart2, font_header, "linked");
 
   SDL_VERSION(&sdl_version_compiled);
+#if defined(TARGET_SDL2)
+  SDL_GetVersion(&sdl_version_linked_ext);
+  sdl_version_linked = &sdl_version_linked_ext;
+#else
   sdl_version_linked = SDL_Linked_Version();
+#endif
 
   ystart2 += 2 * ystep;
   DrawTextF(xstart1, ystart2, font_text, "SDL");
@@ -3071,14 +3083,22 @@ void DrawInfoScreen_Version()
   DrawTextF(xstart2, ystart2, font_header, "Requested");
   DrawTextF(xstart3, ystart2, font_header, "Used");
 
+#if defined(TARGET_SDL2)
+  driver_name = SDL_GetVideoDriver(0);
+#else
   SDL_VideoDriverName(driver_name, driver_name_len);
+#endif
 
   ystart2 += 2 * ystep;
   DrawTextF(xstart1, ystart2, font_text, "SDL_VideoDriver");
   DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_videodriver);
   DrawTextF(xstart3, ystart2, font_text, "%s", driver_name);
 
+#if defined(TARGET_SDL2)
+  driver_name = SDL_GetAudioDriver(0);
+#else
   SDL_AudioDriverName(driver_name, driver_name_len);
+#endif
 
   ystart2 += ystep;
   DrawTextF(xstart1, ystart2, font_text, "SDL_AudioDriver");
@@ -4222,6 +4242,7 @@ static void execSetupGraphics()
   DrawSetupScreen();
 }
 
+#if !defined(TARGET_SDL2)
 static void execSetupChooseScreenMode()
 {
   if (!video.fullscreen_available)
@@ -4231,6 +4252,7 @@ static void execSetupChooseScreenMode()
 
   DrawSetupScreen();
 }
+#endif
 
 static void execSetupChooseScrollDelay()
 {
@@ -4581,8 +4603,10 @@ static struct TokenInfo setup_info_editor[] =
 static struct TokenInfo setup_info_graphics[] =
 {
   { TYPE_SWITCH,       &setup.fullscreen,      "Fullscreen:"           },
+#if !defined(TARGET_SDL2)
   { TYPE_ENTER_LIST,   execSetupChooseScreenMode, "Fullscreen Mode:"   },
   { TYPE_STRING,       &screen_mode_text,      ""                      },
+#endif
 #if 0
   { TYPE_SWITCH,       &setup.scroll_delay,    "Scroll Delay:"         },
 #endif