projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e9008d6
)
cleanup of warning messages if setting up SDL 1.2 video mode failed
author
Holger Schemel
<info@artsoft.org>
Fri, 1 Apr 2016 15:29:18 +0000
(17:29 +0200)
committer
Holger Schemel
<info@artsoft.org>
Fri, 1 Apr 2016 15:29:18 +0000
(17:29 +0200)
src/libgame/sdl.c
patch
|
blob
|
history
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index 8afeb35bb5bdba99bfdd49b583f8e6cf5c47b91e..9db8347b86747d2b4a6ef52ddf46b9f0bcce101d 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-558,8
+558,7
@@
static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer,
new_surface = SDL_CreateRGBSurface(0, width, height, 32, 0,0,0, 0);
if (new_surface == NULL)
new_surface = SDL_CreateRGBSurface(0, width, height, 32, 0,0,0, 0);
if (new_surface == NULL)
- Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s",
- SDL_GetError());
+ Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
}
else
{
}
else
{
@@
-578,6
+577,9
@@
static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer,
#else
new_surface = SDL_SetVideoMode(width, height, video.depth, surface_flags);
#else
new_surface = SDL_SetVideoMode(width, height, video.depth, surface_flags);
+
+ if (new_surface == NULL)
+ Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
#endif
#if defined(TARGET_SDL2)
#endif
#if defined(TARGET_SDL2)
@@
-610,10
+612,7
@@
boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
if (new_surface == NULL)
{
if (new_surface == NULL)
{
- /* switching display to fullscreen mode failed */
- Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
-
- /* do not try it again */
+ /* switching display to fullscreen mode failed -- do not try it again */
video.fullscreen_available = FALSE;
success = FALSE;
video.fullscreen_available = FALSE;
success = FALSE;
@@
-636,7
+635,6
@@
boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
if (new_surface == NULL)
{
/* switching display to window mode failed -- should not happen */
if (new_surface == NULL)
{
/* switching display to window mode failed -- should not happen */
- Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
success = FALSE;
}
success = FALSE;
}