projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improved error tolerance of SDL native surface conversion
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index 2217842e8c8b132e7e17193360b7dcd236de158a..e7e985052cb7e9f7b8ebd88f4863620e1b939514 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-207,11
+207,13
@@
boolean SDLSetNativeSurface(SDL_Surface **surface)
SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
{
SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
{
- if (surface == NULL ||
- backbuffer == NULL ||
- backbuffer->surface == NULL)
+ if (surface == NULL)
return NULL;
return NULL;
+ if (backbuffer == NULL ||
+ backbuffer->surface == NULL)
+ return SDL_ConvertSurface(surface, surface->format, 0);
+
return SDL_ConvertSurface(surface, backbuffer->surface->format, 0);
}
return SDL_ConvertSurface(surface, backbuffer->surface->format, 0);
}