projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b003831
)
cleanup of screen initialization code
author
Holger Schemel
<info@artsoft.org>
Sat, 2 Apr 2016 09:38:11 +0000
(11:38 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sat, 2 Apr 2016 09:38:11 +0000
(11:38 +0200)
src/libgame/sdl.c
patch
|
blob
|
history
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index a204e45ff13332cb09019531c551f78e3c7a2119..a73bae86f314896acace4666261f575344b0cb36 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-429,8
+429,7
@@
void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
ReCreateBitmap(window, video.width, video.height, video.depth);
}
ReCreateBitmap(window, video.width, video.height, video.depth);
}
-static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer,
- boolean fullscreen)
+static boolean SDLCreateScreen(DrawBuffer **backbuffer, boolean fullscreen)
{
SDL_Surface *new_surface = NULL;
{
SDL_Surface *new_surface = NULL;
@@
-461,12
+460,6
@@
static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer,
video.window_width = window_scaling_factor * width;
video.window_height = window_scaling_factor * height;
video.window_width = window_scaling_factor * width;
video.window_height = window_scaling_factor * height;
- if ((*backbuffer)->surface)
- {
- SDL_FreeSurface((*backbuffer)->surface);
- (*backbuffer)->surface = NULL;
- }
-
#if USE_TARGET_TEXTURE
if (sdl_texture_stream)
{
#if USE_TARGET_TEXTURE
if (sdl_texture_stream)
{
@@
-577,12
+570,6
@@
static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer,
#else // TARGET_SDL
#else // TARGET_SDL
- if ((*backbuffer)->surface)
- {
- SDL_FreeSurface((*backbuffer)->surface);
- (*backbuffer)->surface = NULL;
- }
-
if (gfx.final_screen_bitmap == NULL)
gfx.final_screen_bitmap = CreateBitmapStruct();
if (gfx.final_screen_bitmap == NULL)
gfx.final_screen_bitmap = CreateBitmapStruct();
@@
-618,65
+605,56
@@
static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer,
fullscreen_enabled = fullscreen;
#endif
fullscreen_enabled = fullscreen;
#endif
- return new_surface;
+ if (*backbuffer == NULL)
+ *backbuffer = CreateBitmapStruct();
+
+ (*backbuffer)->width = video.width;
+ (*backbuffer)->height = video.height;
+
+ if ((*backbuffer)->surface)
+ SDL_FreeSurface((*backbuffer)->surface);
+
+ (*backbuffer)->surface = new_surface;
+
+ return (new_surface != NULL);
}
boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
{
}
boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
{
- boolean success = TRUE;
- SDL_Surface *new_surface = NULL;
+ boolean success = FALSE;
SetWindowTitle();
SetWindowTitle();
- if (*backbuffer == NULL)
- *backbuffer = CreateBitmapStruct();
-
- /* (real bitmap might be larger in fullscreen mode with video offsets) */
- (*backbuffer)->width = video.width;
- (*backbuffer)->height = video.height;
-
if (fullscreen && !video.fullscreen_enabled && video.fullscreen_available)
{
/* switch display to fullscreen mode, if available */
if (fullscreen && !video.fullscreen_enabled && video.fullscreen_available)
{
/* switch display to fullscreen mode, if available */
-
new_surface
= SDLCreateScreen(backbuffer, TRUE);
+
success
= SDLCreateScreen(backbuffer, TRUE);
- if (
new_surface == NULL
)
+ if (
!success
)
{
/* switching display to fullscreen mode failed -- do not try it again */
video.fullscreen_available = FALSE;
{
/* switching display to fullscreen mode failed -- do not try it again */
video.fullscreen_available = FALSE;
-
- success = FALSE;
}
else
{
}
else
{
- (*backbuffer)->surface = new_surface;
-
video.fullscreen_enabled = TRUE;
video.fullscreen_enabled = TRUE;
-
- success = TRUE;
}
}
}
}
- if ((!fullscreen && video.fullscreen_enabled) ||
new_surface == NULL
)
+ if ((!fullscreen && video.fullscreen_enabled) ||
!success
)
{
/* switch display to window mode */
{
/* switch display to window mode */
-
new_surface
= SDLCreateScreen(backbuffer, FALSE);
+
success
= SDLCreateScreen(backbuffer, FALSE);
- if (
new_surface == NULL
)
+ if (
!success
)
{
/* switching display to window mode failed -- should not happen */
{
/* switching display to window mode failed -- should not happen */
-
- success = FALSE;
}
else
{
}
else
{
- (*backbuffer)->surface = new_surface;
-
video.fullscreen_enabled = FALSE;
video.window_scaling_percent = setup.window_scaling_percent;
video.window_scaling_quality = setup.window_scaling_quality;
video.fullscreen_enabled = FALSE;
video.window_scaling_percent = setup.window_scaling_percent;
video.window_scaling_quality = setup.window_scaling_quality;
-
- success = TRUE;
}
}
}
}