struct LevelStats level_stats[MAX_LEVELS];
-Display *display = NULL;
-Visual *visual = NULL;
-int screen = 0;
-Colormap cmap = None;
-
DrawWindow *window = NULL;
DrawBuffer *backbuffer = NULL;
DrawBuffer *drawto = NULL;
#endif
int redraw_mask = REDRAW_NONE;
-int redraw_tiles = 0;
int FrameCounter = 0;
/* init/close functions */
/* ========================================================================= */
-void InitProgramInfo(char *argv0,
- char *userdata_subdir, char *userdata_subdir_unix,
+void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir,
char *program_title, char *icon_title,
- char *sdl_icon_filename, char *cookie_prefix,
+ char *icon_filename, char *cookie_prefix,
int program_version)
{
program.command_basepath = getBasePath(argv0);
program.command_basename = getBaseName(argv0);
+ program.config_filename = config_filename;
+
program.userdata_subdir = userdata_subdir;
- program.userdata_subdir_unix = userdata_subdir_unix;
program.userdata_path = getUserGameDataDir();
program.program_title = program_title;
program.window_title = "(undefined)";
program.icon_title = icon_title;
- program.sdl_icon_filename = sdl_icon_filename;
+ program.icon_filename = icon_filename;
program.cookie_prefix = cookie_prefix;
program.version_build = VERSION_BUILD(program_version);
program.version_ident = program_version;
- program.error_filename = getErrorFilename(ERROR_BASENAME);
- program.error_file = stderr;
+ program.log_filename[LOG_OUT_ID] = getLogFilename(LOG_OUT_BASENAME);
+ program.log_filename[LOG_ERR_ID] = getLogFilename(LOG_ERR_BASENAME);
+ program.log_file[LOG_OUT_ID] = program.log_file_default[LOG_OUT_ID] = stdout;
+ program.log_file[LOG_ERR_ID] = program.log_file_default[LOG_ERR_ID] = stderr;
}
void SetWindowTitle()
program.exit_function = exit_function;
/* set signal handlers to custom exit function */
- signal(SIGINT, exit_function);
+ // signal(SIGINT, exit_function);
signal(SIGTERM, exit_function);
/* set exit function to automatically cleanup SDL stuff after exit() */
// this is initialized in GetOptions(), but may already be used before
options.verbose = TRUE;
-#if defined(PLATFORM_MACOSX)
- updateUserGameDataDir();
-#endif
-
- openErrorFile();
+ OpenLogFiles();
#if defined(TARGET_SDL2)
int sdl_init_flags = SDL_INIT_EVENTS | SDL_INIT_NOPARACHUTE;
void ClosePlatformDependentStuff(void)
{
-#if defined(PLATFORM_WIN32)
- closeErrorFile();
-#endif
+ CloseLogFiles();
}
void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
gfx.background_bitmap_mask = REDRAW_NONE;
ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH);
+#if USE_FINAL_SCREEN_BITMAP
+ ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH);
+#endif
}
void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height)
gfx.draw_busy_anim_function = draw_busy_anim_function;
}
+void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int))
+{
+ gfx.draw_global_anim_function = draw_global_anim_function;
+}
+
+void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int))
+{
+ gfx.draw_global_border_function = draw_global_border_function;
+}
+
void InitGfxCustomArtworkInfo()
{
gfx.override_level_graphics = FALSE;
gfx.draw_init_text = TRUE;
}
+void InitGfxOtherSettings()
+{
+ gfx.cursor_mode = CURSOR_DEFAULT;
+}
+
void SetDrawDeactivationMask(int draw_deactivation_mask)
{
gfx.draw_deactivation_mask = draw_deactivation_mask;
}
inline static void sysFillRectangle(Bitmap *bitmap, int x, int y,
- int width, int height, Pixel color)
+ int width, int height, Pixel color)
{
SDLFillRectangle(bitmap, x, y, width, height, color);
+
+ if (bitmap == backbuffer)
+ SetRedrawMaskFromArea(x, y, width, height);
}
inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap,
{
SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
dst_x, dst_y, mask_mode);
+
+ if (dst_bitmap == backbuffer)
+ SetRedrawMaskFromArea(dst_x, dst_y, width, height);
}
void LimitScreenUpdates(boolean enable)
SDLInitVideoBuffer(&backbuffer, &window, fullscreen);
+ video.initialized = TRUE;
+
drawto = backbuffer;
}
Bitmap *CreateBitmapStruct(void)
{
- return checked_calloc(sizeof(struct SDLSurfaceInfo));
+ return checked_calloc(sizeof(Bitmap));
}
Bitmap *CreateBitmap(int width, int height, int depth)
{
}
+void SetRedrawMaskFromArea(int x, int y, int width, int height)
+{
+ int x1 = x;
+ int y1 = y;
+ int x2 = x + width - 1;
+ int y2 = y + height - 1;
+
+ if (width == 0 || height == 0)
+ return;
+
+ if (IN_GFX_FIELD_FULL(x1, y1) && IN_GFX_FIELD_FULL(x2, y2))
+ redraw_mask |= REDRAW_FIELD;
+ else if (IN_GFX_DOOR_1(x1, y1) && IN_GFX_DOOR_1(x2, y2))
+ redraw_mask |= REDRAW_DOOR_1;
+ else if (IN_GFX_DOOR_2(x1, y1) && IN_GFX_DOOR_2(x2, y2))
+ redraw_mask |= REDRAW_DOOR_2;
+ else if (IN_GFX_DOOR_3(x1, y1) && IN_GFX_DOOR_3(x2, y2))
+ redraw_mask |= REDRAW_DOOR_3;
+ else
+ redraw_mask = REDRAW_ALL;
+}
+
inline static boolean CheckDrawingArea(int x, int y, int width, int height,
int draw_mask)
{
ClearRectangle(bitmap, x, y, width, height);
}
-void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
-{
-}
-
-void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
-{
-}
-
void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
int src_x, int src_y, int width, int height,
int dst_x, int dst_y)
dst_x, dst_y);
/* draw foreground */
- SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
- dst_x - src_x, dst_y - src_y);
BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y, width, height,
dst_x, dst_y);
}
dst_x, dst_y);
}
+void BlitTexture(Bitmap *bitmap,
+ int src_x, int src_y, int width, int height,
+ int dst_x, int dst_y)
+{
+ if (bitmap == NULL)
+ return;
+
+ SDLBlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y,
+ BLIT_OPAQUE);
+}
+
+void BlitTextureMasked(Bitmap *bitmap,
+ int src_x, int src_y, int width, int height,
+ int dst_x, int dst_y)
+{
+ if (bitmap == NULL)
+ return;
+
+ SDLBlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y,
+ BLIT_MASKED);
+}
+
+void BlitToScreen(Bitmap *bitmap,
+ int src_x, int src_y, int width, int height,
+ int dst_x, int dst_y)
+{
+ if (bitmap == NULL)
+ return;
+
+#if USE_FINAL_SCREEN_BITMAP
+ BlitBitmap(bitmap, gfx.final_screen_bitmap, src_x, src_y,
+ width, height, dst_x, dst_y);
+#else
+ BlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y);
+#endif
+}
+
+void BlitToScreenMasked(Bitmap *bitmap,
+ int src_x, int src_y, int width, int height,
+ int dst_x, int dst_y)
+{
+ if (bitmap == NULL)
+ return;
+
+#if USE_FINAL_SCREEN_BITMAP
+ BlitBitmapMasked(bitmap, gfx.final_screen_bitmap, src_x, src_y,
+ width, height, dst_x, dst_y);
+#else
+ BlitTextureMasked(bitmap, src_x, src_y, width, height, dst_x, dst_y);
+#endif
+}
+
void DrawSimpleBlackLine(Bitmap *bitmap, int from_x, int from_y,
int to_x, int to_y)
{
return GetPixelFromRGB(bitmap, color_r, color_g, color_b);
}
-/* execute all pending screen drawing operations */
-void FlushDisplay(void)
-{
-}
-
-/* execute and wait for all pending screen drawing operations */
-void SyncDisplay(void)
-{
-}
-
void KeyboardAutoRepeatOn(void)
{
#if defined(TARGET_SDL2)
#endif
}
-boolean PointerInWindow(DrawWindow *window)
-{
- return TRUE;
-}
-
boolean SetVideoMode(boolean fullscreen)
{
return SDLSetVideoMode(&backbuffer, fullscreen);
Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename);
if ((new_bitmap = LoadImage(filename)) == NULL)
- Error(ERR_EXIT, "LoadImage() failed: %s", GetError());
+ Error(ERR_EXIT, "LoadImage('%s') failed: %s", basename, GetError());
return new_bitmap;
}
if ((new_bitmap = LoadImage(filename)) == NULL)
{
- Error(ERR_WARN, "LoadImage() failed: %s", GetError());
+ Error(ERR_WARN, "LoadImage('%s') failed: %s", basename, GetError());
return;
}
return dst_bitmap;
}
-static void CreateScaledBitmaps(Bitmap *old_bitmap, int zoom_factor,
+static void SetMaskedBitmapSurface(Bitmap *bitmap)
+{
+ if (bitmap == NULL)
+ return;
+
+ SDL_Surface *surface = bitmap->surface;
+
+ if (bitmap->surface_masked)
+ SDL_FreeSurface(bitmap->surface_masked);
+
+ SDL_SetColorKey(surface, SET_TRANSPARENT_PIXEL,
+ SDL_MapRGB(surface->format, 0x00, 0x00, 0x00));
+
+ if ((bitmap->surface_masked = SDLGetNativeSurface(surface)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed");
+
+ SDL_SetColorKey(surface, UNSET_TRANSPARENT_PIXEL, 0);
+}
+
+void ReCreateGameTileSizeBitmap(Bitmap **bitmaps)
+{
+ if (bitmaps[IMG_BITMAP_CUSTOM])
+ {
+ FreeBitmap(bitmaps[IMG_BITMAP_CUSTOM]);
+
+ bitmaps[IMG_BITMAP_CUSTOM] = NULL;
+ }
+
+ if (gfx.game_tile_size == gfx.standard_tile_size)
+ {
+ bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_STANDARD];
+
+ return;
+ }
+
+ Bitmap *bitmap = bitmaps[IMG_BITMAP_STANDARD];
+ int width = bitmap->width * gfx.game_tile_size / gfx.standard_tile_size;;
+ int height = bitmap->height * gfx.game_tile_size / gfx.standard_tile_size;;
+
+ Bitmap *bitmap_new = ZoomBitmap(bitmap, width, height);
+
+ bitmaps[IMG_BITMAP_CUSTOM] = bitmap_new;
+ bitmaps[IMG_BITMAP_GAME] = bitmap_new;
+
+ SetMaskedBitmapSurface(bitmap_new);
+}
+
+static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
int tile_size, boolean create_small_bitmaps)
{
- Bitmap swap_bitmap;
- Bitmap *new_bitmap;
+ Bitmap *old_bitmap = bitmaps[IMG_BITMAP_STANDARD];
Bitmap *tmp_bitmap_final = NULL;
Bitmap *tmp_bitmap_0 = NULL;
Bitmap *tmp_bitmap_1 = NULL;
int width_16, height_16;
int width_32, height_32;
int old_width, old_height;
- int new_width, new_height;
+ int i;
print_timestamp_init("CreateScaledBitmaps");
UPDATE_BUSY_STATE();
}
- }
- if (create_small_bitmaps)
- {
/* calculate new image dimensions for small images */
width_2 = width_1 / 2;
height_2 = height_1 / 2;
tmp_bitmap_32 = ZoomBitmap(tmp_bitmap_16, width_32, height_32);
UPDATE_BUSY_STATE();
- }
- if (create_small_bitmaps)
- {
- new_width = width_1;
- new_height = height_1 + (height_1 + 1) / 2; /* prevent odd height */
+ bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1;
+ bitmaps[IMG_BITMAP_16x16] = tmp_bitmap_2;
+ bitmaps[IMG_BITMAP_8x8] = tmp_bitmap_4;
+ bitmaps[IMG_BITMAP_4x4] = tmp_bitmap_8;
+ bitmaps[IMG_BITMAP_2x2] = tmp_bitmap_16;
+ bitmaps[IMG_BITMAP_1x1] = tmp_bitmap_32;
if (width_0 != width_1)
- {
- new_width += width_0;
- new_height = MAX(new_height, height_0);
- }
+ bitmaps[IMG_BITMAP_CUSTOM] = tmp_bitmap_0;
- new_bitmap = CreateBitmap(new_width, new_height, DEFAULT_DEPTH);
+ if (bitmaps[IMG_BITMAP_CUSTOM])
+ bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_CUSTOM];
+ else
+ bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_STANDARD];
- if (width_0 != width_1)
- BlitBitmap(tmp_bitmap_0, new_bitmap, 0, 0, width_0, height_0, width_1, 0);
-
- BlitBitmap(tmp_bitmap_1, new_bitmap, 0, 0, width_1, height_1, 0, 0);
- BlitBitmap(tmp_bitmap_2, new_bitmap, 0, 0, width_1 / 2, height_1 / 2,
- 0, height_1);
- BlitBitmap(tmp_bitmap_4, new_bitmap, 0, 0, width_1 / 4, height_1 / 4,
- width_1 / 2, height_1);
- BlitBitmap(tmp_bitmap_8, new_bitmap, 0, 0, width_1 / 8, height_1 / 8,
- 3 * width_1 / 4, height_1);
- BlitBitmap(tmp_bitmap_16, new_bitmap, 0, 0, width_1 / 16, height_1 / 16,
- 7 * width_1 / 8, height_1);
- BlitBitmap(tmp_bitmap_32, new_bitmap, 0, 0, width_1 / 32, height_1 / 32,
- 15 * width_1 / 16, height_1);
+ boolean free_old_bitmap = TRUE;
- UPDATE_BUSY_STATE();
- }
- else
- {
- new_width = width_1;
- new_height = height_1;
+ for (i = 0; i < NUM_IMG_BITMAPS; i++)
+ if (bitmaps[i] == old_bitmap)
+ free_old_bitmap = FALSE;
- new_bitmap = tmp_bitmap_1; /* directly use tmp_bitmap_1 as new bitmap */
+ if (free_old_bitmap)
+ FreeBitmap(old_bitmap);
}
-
- if (create_small_bitmaps)
+ else
{
- /* if no small bitmaps created, tmp_bitmap_1 is used as new bitmap now */
-
- if (tmp_bitmap_final != old_bitmap)
- FreeBitmap(tmp_bitmap_final);
-
- if (tmp_bitmap_0 != old_bitmap &&
- tmp_bitmap_0 != tmp_bitmap_final)
- FreeBitmap(tmp_bitmap_0);
-
- if (tmp_bitmap_1 != old_bitmap &&
- tmp_bitmap_1 != tmp_bitmap_final &&
- tmp_bitmap_1 != tmp_bitmap_0)
- FreeBitmap(tmp_bitmap_1);
-
- if (tmp_bitmap_2 != old_bitmap)
- FreeBitmap(tmp_bitmap_2);
-
- if (tmp_bitmap_4 != old_bitmap)
- FreeBitmap(tmp_bitmap_4);
-
- if (tmp_bitmap_8 != old_bitmap)
- FreeBitmap(tmp_bitmap_8);
-
- if (tmp_bitmap_16 != old_bitmap)
- FreeBitmap(tmp_bitmap_16);
-
- if (tmp_bitmap_32 != old_bitmap)
- FreeBitmap(tmp_bitmap_32);
+ bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1;
}
- /* replace image with extended image (containing 1/1, 1/2, 1/4, 1/8 size) */
- swap_bitmap.surface = old_bitmap->surface;
- old_bitmap->surface = new_bitmap->surface;
- new_bitmap->surface = swap_bitmap.surface;
-
- old_bitmap->width = new_bitmap->width;
- old_bitmap->height = new_bitmap->height;
-
- /* this replaces all blit masks created when loading -- maybe optimize this */
- {
- SDL_Surface *old_surface = old_bitmap->surface;
-
- if (old_bitmap->surface_masked)
- SDL_FreeSurface(old_bitmap->surface_masked);
-
- SDL_SetColorKey(old_surface, SET_TRANSPARENT_PIXEL,
- SDL_MapRGB(old_surface->format, 0x00, 0x00, 0x00));
-
- if ((old_bitmap->surface_masked = SDLGetNativeSurface(old_surface)) == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed");
-
- SDL_SetColorKey(old_surface, UNSET_TRANSPARENT_PIXEL, 0);
- }
+ // create corresponding bitmaps for masked blitting
+ for (i = 0; i < NUM_IMG_BITMAPS; i++)
+ if (bitmaps[i] != NULL &&
+ bitmaps[i] != old_bitmap)
+ SetMaskedBitmapSurface(bitmaps[i]);
UPDATE_BUSY_STATE();
- FreeBitmap(new_bitmap); /* this actually frees the _old_ bitmap now */
-
print_timestamp_done("CreateScaledBitmaps");
}
-void CreateBitmapWithSmallBitmaps(Bitmap *old_bitmap, int zoom_factor,
+void CreateBitmapWithSmallBitmaps(Bitmap **bitmaps, int zoom_factor,
int tile_size)
{
- CreateScaledBitmaps(old_bitmap, zoom_factor, tile_size, TRUE);
+ CreateScaledBitmaps(bitmaps, zoom_factor, tile_size, TRUE);
+}
+
+void CreateBitmapTextures(Bitmap **bitmaps)
+{
+ SDLCreateBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]);
}
-void ScaleBitmap(Bitmap *old_bitmap, int zoom_factor)
+void FreeBitmapTextures(Bitmap **bitmaps)
{
- CreateScaledBitmaps(old_bitmap, zoom_factor, 0, FALSE);
+ SDLFreeBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]);
+}
+
+void ScaleBitmap(Bitmap **bitmaps, int zoom_factor)
+{
+ CreateScaledBitmaps(bitmaps, zoom_factor, 0, FALSE);
}
mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL);
SDLSetMouseCursor(cursor_new);
+
+ gfx.cursor_mode = mode;
}
projects / rocksndiamonds.git / blobdiff