projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed redundant code (again)
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index a73bae86f314896acace4666261f575344b0cb36..08aec8dcbd0f5a9309a508d0d705c2e01560c359 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-383,8
+383,7
@@
void SDLInitVideoDisplay(void)
#endif
}
#endif
}
-void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
- boolean fullscreen)
+void SDLInitVideoBuffer(boolean fullscreen)
{
video.window_scaling_percent = setup.window_scaling_percent;
video.window_scaling_quality = setup.window_scaling_quality;
{
video.window_scaling_percent = setup.window_scaling_percent;
video.window_scaling_quality = setup.window_scaling_quality;
@@
-398,7
+397,7
@@
void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
#endif
/* open SDL video output device (window or fullscreen mode) */
#endif
/* open SDL video output device (window or fullscreen mode) */
- if (!SDLSetVideoMode(
backbuffer,
fullscreen))
+ if (!SDLSetVideoMode(fullscreen))
Error(ERR_EXIT, "setting video mode failed");
/* !!! SDL2 can only set the window icon if the window already exists !!! */
Error(ERR_EXIT, "setting video mode failed");
/* !!! SDL2 can only set the window icon if the window already exists !!! */
@@
-426,10
+425,10
@@
void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
should never be drawn to directly, it would do no harm nevertheless. */
/* create additional (symbolic) buffer for double-buffering */
should never be drawn to directly, it would do no harm nevertheless. */
/* create additional (symbolic) buffer for double-buffering */
- ReCreateBitmap(window, video.width, video.height, video.depth);
+ ReCreateBitmap(
&
window, video.width, video.height, video.depth);
}
}
-static boolean SDLCreateScreen(
DrawBuffer **backbuffer,
boolean fullscreen)
+static boolean SDLCreateScreen(boolean fullscreen)
{
SDL_Surface *new_surface = NULL;
{
SDL_Surface *new_surface = NULL;
@@
-605,21
+604,21
@@
static boolean SDLCreateScreen(DrawBuffer **backbuffer, boolean fullscreen)
fullscreen_enabled = fullscreen;
#endif
fullscreen_enabled = fullscreen;
#endif
- if (
*
backbuffer == NULL)
-
*
backbuffer = CreateBitmapStruct();
+ if (backbuffer == NULL)
+ backbuffer = CreateBitmapStruct();
-
(*backbuffer)
->width = video.width;
-
(*backbuffer)
->height = video.height;
+
backbuffer
->width = video.width;
+
backbuffer
->height = video.height;
- if (
(*backbuffer)
->surface)
- SDL_FreeSurface(
(*backbuffer)
->surface);
+ if (
backbuffer
->surface)
+ SDL_FreeSurface(
backbuffer
->surface);
-
(*backbuffer)
->surface = new_surface;
+
backbuffer
->surface = new_surface;
return (new_surface != NULL);
}
return (new_surface != NULL);
}
-boolean SDLSetVideoMode(
DrawBuffer **backbuffer,
boolean fullscreen)
+boolean SDLSetVideoMode(boolean fullscreen)
{
boolean success = FALSE;
{
boolean success = FALSE;
@@
-628,7
+627,7
@@
boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
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 */
- success = SDLCreateScreen(
backbuffer,
TRUE);
+ success = SDLCreateScreen(TRUE);
if (!success)
{
if (!success)
{
@@
-644,7
+643,7
@@
boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
if ((!fullscreen && video.fullscreen_enabled) || !success)
{
/* switch display to window mode */
if ((!fullscreen && video.fullscreen_enabled) || !success)
{
/* switch display to window mode */
- success = SDLCreateScreen(
backbuffer,
FALSE);
+ success = SDLCreateScreen(FALSE);
if (!success)
{
if (!success)
{
@@
-918,20
+917,8
@@
void SDLFillRectangle(Bitmap *dst_bitmap, int x, int y, int width, int height,
SDL_FillRect(real_dst_bitmap->surface, &rect, color);
SDL_FillRect(real_dst_bitmap->surface, &rect, color);
-#if defined(TARGET_SDL2)
if (dst_bitmap == window)
if (dst_bitmap == window)
- {
- // SDL_UpdateWindowSurface(sdl_window);
- // SDL_UpdateWindowSurfaceRects(sdl_window, &rect, 1);
UpdateScreen(&rect);
UpdateScreen(&rect);
- }
-#else
- if (dst_bitmap == window)
- {
- // SDL_UpdateRect(backbuffer->surface, x, y, width, height);
- UpdateScreen(&rect);
- }
-#endif
}
void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
}
void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,