if (redraw_mask & REDRAW_ALL)
fade_mask = REDRAW_ALL;
- if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+ if (CheckFadeAll())
fade_mask = REDRAW_ALL;
FadeOut(fade_mask);
if (redraw_mask & REDRAW_ALL)
fade_mask = REDRAW_ALL;
- if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+ if (CheckFadeAll())
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
SDL_version sdl_version_compiled;
const SDL_version *sdl_version_linked;
int driver_name_len = 10;
-#if defined(TARGET_SDL2)
SDL_version sdl_version_linked_ext;
const char *driver_name = NULL;
-#else
- char driver_name[driver_name_len];
-#endif
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
ystart += ystep_head;
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
DrawTextF(xstart1, ystart, font_text, "SDL");
DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
DrawTextF(xstart3, ystart, font_head, "Used");
ystart += ystep_head;
-#if defined(TARGET_SDL2)
driver_name = getStringCopyNStatic(SDL_GetVideoDriver(0), driver_name_len);
-#else
- SDL_VideoDriverName(driver_name, driver_name_len);
-#endif
DrawTextF(xstart1, ystart, font_text, "SDL_VideoDriver");
DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_videodriver);
DrawTextF(xstart3, ystart, font_text, "%s", driver_name);
ystart += ystep_line;
-#if defined(TARGET_SDL2)
driver_name = getStringCopyNStatic(SDL_GetAudioDriver(0), driver_name_len);
-#else
- SDL_AudioDriverName(driver_name, driver_name_len);
-#endif
DrawTextF(xstart1, ystart, font_text, "SDL_AudioDriver");
DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_audiodriver);
{
int fade_mask = REDRAW_FIELD;
- if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+ if (CheckFadeAll())
fade_mask = REDRAW_ALL;
if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
{
int fade_mask = REDRAW_FIELD;
- if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+ if (CheckFadeAll())
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
if (check_game_speed)
ModifyGameSpeedIfNeeded();
-#if defined(TARGET_SDL2)
// window scaling may have changed at this point
ToggleFullscreenOrChangeWindowScalingIfNeeded();
// screen vsync mode may have changed at this point
SDLSetScreenVsyncMode(setup.vsync_mode);
-#endif
}
static void execSetupChooseWindowSize(void)
static struct TokenInfo setup_info_graphics[] =
{
-#if defined(TARGET_SDL2) && !defined(PLATFORM_ANDROID)
+#if !defined(PLATFORM_ANDROID)
{ TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" },
{ TYPE_ENTER_LIST, execSetupChooseWindowSize, "Window Scaling:" },
{ TYPE_STRING, &window_size_text, "" },
char *title_string = NULL;
int i;
- if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+ if (CheckFadeAll())
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
{
-#if defined(TARGET_SDL2)
static boolean bitmaps_initialized = FALSE;
boolean screen_initialized = FALSE;
static Bitmap *controller, *button, *axis_x, *axis_y;
while (NextValidEvent(&event));
return success;
-#else
- return TRUE;
-#endif
}
static int ConfigureJoystickMain(int player_nr)
// press 'Enter' to keep the existing key binding
if (key == KSYM_Return ||
-#if defined(TARGET_SDL2)
key == KSYM_Menu ||
-#endif
key == KSYM_space)
{
step_nr++;
}
- else if (key == KSYM_BackSpace
-#if defined(TARGET_SDL2)
- ||
- key == KSYM_Back
-#endif
- )
+ else if (key == KSYM_BackSpace ||
+ key == KSYM_Back)
{
if (step_nr == 0)
{
}
break;
-#if defined(TARGET_SDL2)
case SDL_WINDOWEVENT:
HandleWindowEvent((WindowEvent *) &event);
case SDL_APP_DIDENTERFOREGROUND:
HandlePauseResumeEvent((PauseResumeEvent *) &event);
break;
-#endif
default:
HandleOtherEvents(&event);