projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20001203-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index 2d6d16b5072df53ae1e1d64ac8e415b2e25c1a09..19526fe0b5a3c1ff1847f019a7e2e0ed302db8cf 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-65,10
+65,11
@@
inline boolean SDLSetVideoMode(DrawBuffer *backbuffer, boolean fullscreen)
{
/* switch display to fullscreen mode, if available */
DrawWindow window_old = *backbuffer;
{
/* switch display to fullscreen mode, if available */
DrawWindow window_old = *backbuffer;
- DrawWindow window_new;
+ DrawWindow window_new
= CreateBitmapStruct()
;
- if ((window_new = SDL_SetVideoMode(video.width, video.height, video.depth,
- surface_flags)) == NULL)
+ if ((window_new->surface = SDL_SetVideoMode(video.width, video.height,
+ video.depth, surface_flags))
+ == NULL)
{
/* switching display to fullscreen mode failed */
Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
{
/* switching display to fullscreen mode failed */
Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
@@
-80,7
+81,7
@@
inline boolean SDLSetVideoMode(DrawBuffer *backbuffer, boolean fullscreen)
else
{
if (window_old)
else
{
if (window_old)
-
SDL_FreeSurface
(window_old);
+
FreeBitmap
(window_old);
*backbuffer = window_new;
video.fullscreen_enabled = TRUE;
*backbuffer = window_new;
video.fullscreen_enabled = TRUE;
@@
-92,10
+93,11
@@
inline boolean SDLSetVideoMode(DrawBuffer *backbuffer, boolean fullscreen)
{
/* switch display to window mode */
DrawWindow window_old = *backbuffer;
{
/* switch display to window mode */
DrawWindow window_old = *backbuffer;
- DrawWindow window_new;
+ DrawWindow window_new
= CreateBitmapStruct()
;
- if ((window_new = SDL_SetVideoMode(video.width, video.height, video.depth,
- surface_flags)) == NULL)
+ if ((window_new->surface = SDL_SetVideoMode(video.width, video.height,
+ video.depth, surface_flags))
+ == NULL)
{
/* switching display to window mode failed -- should not happen */
Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
{
/* switching display to window mode failed -- should not happen */
Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
@@
-105,7
+107,7
@@
inline boolean SDLSetVideoMode(DrawBuffer *backbuffer, boolean fullscreen)
else
{
if (window_old)
else
{
if (window_old)
-
SDL_FreeSurface
(window_old);
+
FreeBitmap
(window_old);
*backbuffer = window_new;
video.fullscreen_enabled = FALSE;
*backbuffer = window_new;
video.fullscreen_enabled = FALSE;