X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=15e86a4afbc7084012132acac0f133577914085f;hp=139ee57a562d6c2a046d7397c9df6e4d6c445e0e;hb=c38790fcee093efb156366bb4a02dbde55085ca4;hpb=7d85a53b341ca7a3dca87b6f2ccebf45ddf96c92 diff --git a/src/libgame/system.c b/src/libgame/system.c index 139ee57a..15e86a4a 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -21,14 +21,16 @@ #include "joystick.h" #include "misc.h" -#define ENABLE_UNUSED_CODE 0 /* currently unused functions */ +#define ENABLE_UNUSED_CODE 0 // currently unused functions -/* ========================================================================= */ -/* exported variables */ -/* ========================================================================= */ +// ============================================================================ +// exported variables +// ============================================================================ struct ProgramInfo program; +struct NetworkInfo network; +struct RuntimeInfo runtime; struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; @@ -44,6 +46,7 @@ LevelDirTree *leveldir_first = NULL; LevelDirTree *leveldir_current = NULL; int level_nr; +struct LevelSetInfo levelset; struct LevelStats level_stats[MAX_LEVELS]; DrawWindow *window = NULL; @@ -53,18 +56,16 @@ DrawBuffer *drawto = NULL; int button_status = MB_NOT_PRESSED; boolean motion_status = FALSE; int wheel_steps = DEFAULT_WHEEL_STEPS; -#if defined(TARGET_SDL2) boolean keyrepeat_status = TRUE; -#endif int redraw_mask = REDRAW_NONE; int FrameCounter = 0; -/* ========================================================================= */ -/* init/close functions */ -/* ========================================================================= */ +// ============================================================================ +// init/close functions +// ============================================================================ void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, char *program_title, char *icon_title, @@ -87,10 +88,10 @@ void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, program.cookie_prefix = cookie_prefix; + program.version_super = VERSION_SUPER(program_version); program.version_major = VERSION_MAJOR(program_version); program.version_minor = VERSION_MINOR(program_version); program.version_patch = VERSION_PATCH(program_version); - program.version_build = VERSION_BUILD(program_version); program.version_ident = program_version; program.version_string = program_version_string; @@ -103,13 +104,30 @@ void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, program.headless = FALSE; } -void InitScoresInfo() +void InitNetworkInfo(boolean enabled, boolean connected, boolean serveronly, + char *server_host, int server_port) +{ + network.enabled = enabled; + network.connected = connected; + network.serveronly = serveronly; + + network.server_host = server_host; + network.server_port = server_port; +} + +void InitRuntimeInfo() +{ + runtime.uses_touch_device = FALSE; +} + +void InitScoresInfo(void) { char *global_scores_dir = getPath2(getCommonDataDir(), SCORES_DIRECTORY); program.global_scores = directoryExists(global_scores_dir); program.many_scores_per_name = !program.global_scores; +#if 0 if (options.debug) { if (program.global_scores) @@ -124,11 +142,12 @@ void InitScoresInfo() Error(ERR_DEBUG, "Using private, single-user scores directory."); } } +#endif free(global_scores_dir); } -void SetWindowTitle() +void SetWindowTitle(void) { program.window_title = program.window_title_function(); @@ -149,11 +168,11 @@ void InitExitFunction(void (*exit_function)(int)) { program.exit_function = exit_function; - /* set signal handlers to custom exit function */ + // set signal handlers to custom exit function // signal(SIGINT, exit_function); signal(SIGTERM, exit_function); - /* set exit function to automatically cleanup SDL stuff after exit() */ + // set exit function to automatically cleanup SDL stuff after exit() atexit(SDL_Quit); } @@ -164,11 +183,7 @@ void InitPlatformDependentStuff(void) OpenLogFiles(); -#if defined(TARGET_SDL2) - int sdl_init_flags = SDL_INIT_EVENTS | SDL_INIT_NOPARACHUTE; -#else - int sdl_init_flags = SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE; -#endif + int sdl_init_flags = SDL_INIT_EVENTS | SDL_INIT_NOPARACHUTE; if (SDL_Init(sdl_init_flags) < 0) Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); @@ -197,8 +212,8 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, gfx.field_save_buffer = field_save_buffer; - SetDrawDeactivationMask(REDRAW_NONE); /* do not deactivate drawing */ - SetDrawBackgroundMask(REDRAW_NONE); /* deactivate masked drawing */ + SetDrawDeactivationMask(REDRAW_NONE); // do not deactivate drawing + SetDrawBackgroundMask(REDRAW_NONE); // deactivate masked drawing } void InitGfxTileSizeInfo(int game_tile_size, int standard_tile_size) @@ -237,9 +252,7 @@ void InitGfxWindowInfo(int win_xsize, int win_ysize) { ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize); -#if defined(TARGET_SDL2) ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize); -#endif ReCreateBitmap(&gfx.fade_bitmap_backup, win_xsize, win_ysize); ReCreateBitmap(&gfx.fade_bitmap_source, win_xsize, win_ysize); @@ -257,8 +270,8 @@ void InitGfxWindowInfo(int win_xsize, int win_ysize) void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height) { - /* currently only used by MSDOS code to alloc VRAM buffer, if available */ - /* 2009-03-24: also (temporarily?) used for overlapping blit workaround */ + // currently only used by MSDOS code to alloc VRAM buffer, if available + // 2009-03-24: also (temporarily?) used for overlapping blit workaround gfx.scrollbuffer_width = scrollbuffer_width; gfx.scrollbuffer_height = scrollbuffer_height; } @@ -292,7 +305,7 @@ void InitGfxDrawTileCursorFunction(void (*draw_tile_cursor_function)(int)) gfx.draw_tile_cursor_function = draw_tile_cursor_function; } -void InitGfxCustomArtworkInfo() +void InitGfxCustomArtworkInfo(void) { gfx.override_level_graphics = FALSE; gfx.override_level_sounds = FALSE; @@ -301,12 +314,14 @@ void InitGfxCustomArtworkInfo() gfx.draw_init_text = TRUE; } -void InitGfxOtherSettings() +void InitGfxOtherSettings(void) { gfx.cursor_mode = CURSOR_DEFAULT; + gfx.mouse_x = 0; + gfx.mouse_y = 0; } -void InitTileCursorInfo() +void InitTileCursorInfo(void) { tile_cursor.enabled = FALSE; tile_cursor.active = FALSE; @@ -323,12 +338,27 @@ void InitTileCursorInfo() tile_cursor.sy = 0; } -void InitOverlayInfo() +void InitOverlayInfo(void) { + int nr = GRID_ACTIVE_NR(); + int x, y; + overlay.enabled = FALSE; overlay.active = FALSE; -#if defined(PLATFORM_ANDROID) + overlay.show_grid = FALSE; + + overlay.grid_xsize = setup.touch.grid_xsize[nr]; + overlay.grid_ysize = setup.touch.grid_ysize[nr]; + + for (x = 0; x < MAX_GRID_XSIZE; x++) + for (y = 0; y < MAX_GRID_YSIZE; y++) + overlay.grid_button[x][y] = setup.touch.grid_button[nr][x][y]; + + overlay.grid_button_highlight = CHAR_GRID_BUTTON_NONE; + overlay.grid_button_action = JOY_NO_ACTION; + +#if defined(USE_TOUCH_INPUT_OVERLAY) if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) overlay.enabled = TRUE; #endif @@ -385,7 +415,22 @@ void SetOverlayActive(boolean active) overlay.active = active; } -boolean GetOverlayActive() +void SetOverlayShowGrid(boolean show_grid) +{ + overlay.show_grid = show_grid; + + SetOverlayActive(show_grid); + + if (show_grid) + SetOverlayEnabled(TRUE); +} + +boolean GetOverlayEnabled(void) +{ + return overlay.enabled; +} + +boolean GetOverlayActive(void) { return overlay.active; } @@ -395,7 +440,7 @@ void SetDrawDeactivationMask(int draw_deactivation_mask) gfx.draw_deactivation_mask = draw_deactivation_mask; } -int GetDrawDeactivationMask() +int GetDrawDeactivationMask(void) { return gfx.draw_deactivation_mask; } @@ -405,14 +450,14 @@ void SetDrawBackgroundMask(int draw_background_mask) gfx.draw_background_mask = draw_background_mask; } -void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) +static void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) { if (background_bitmap_tile != NULL) gfx.background_bitmap_mask |= mask; else gfx.background_bitmap_mask &= ~mask; - if (background_bitmap_tile == NULL) /* empty background requested */ + if (background_bitmap_tile == NULL) // empty background requested return; if (mask == REDRAW_ALL) @@ -428,40 +473,40 @@ void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) void SetWindowBackgroundBitmap(Bitmap *background_bitmap_tile) { - /* remove every mask before setting mask for window */ - /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */ - SetBackgroundBitmap(NULL, 0xffff); /* !!! FIX THIS !!! */ + // remove every mask before setting mask for window + // (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) + SetBackgroundBitmap(NULL, 0xffff); // !!! FIX THIS !!! SetBackgroundBitmap(background_bitmap_tile, REDRAW_ALL); } void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile) { - /* remove window area mask before setting mask for main area */ - /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */ - SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */ + // remove window area mask before setting mask for main area + // (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) + SetBackgroundBitmap(NULL, REDRAW_ALL); // !!! FIX THIS !!! SetBackgroundBitmap(background_bitmap_tile, REDRAW_FIELD); } void SetDoorBackgroundBitmap(Bitmap *background_bitmap_tile) { - /* remove window area mask before setting mask for door area */ - /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */ - SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */ + // remove window area mask before setting mask for door area + // (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) + SetBackgroundBitmap(NULL, REDRAW_ALL); // !!! FIX THIS !!! SetBackgroundBitmap(background_bitmap_tile, REDRAW_DOOR_1); } -/* ========================================================================= */ -/* video functions */ -/* ========================================================================= */ +// ============================================================================ +// video functions +// ============================================================================ -inline static int GetRealDepth(int depth) +static int GetRealDepth(int depth) { return (depth == DEFAULT_DEPTH ? video.default_depth : depth); } -inline static void sysFillRectangle(Bitmap *bitmap, int x, int y, - int width, int height, Pixel color) +static void sysFillRectangle(Bitmap *bitmap, int x, int y, + int width, int height, Pixel color) { SDLFillRectangle(bitmap, x, y, width, height, color); @@ -469,9 +514,9 @@ inline static void sysFillRectangle(Bitmap *bitmap, int x, int y, SetRedrawMaskFromArea(x, y, width, height); } -inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, - int src_x, int src_y, int width, int height, - int dst_x, int dst_y, int mask_mode) +static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y, int mask_mode) { SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y, mask_mode); @@ -496,9 +541,7 @@ void InitVideoDisplay(void) return; SDLInitVideoDisplay(); -#if defined(TARGET_SDL2) SDLSetDisplaySize(); -#endif } void CloseVideoDisplay(void) @@ -540,7 +583,7 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen) drawto = backbuffer; } -inline static void FreeBitmapPointers(Bitmap *bitmap) +static void FreeBitmapPointers(Bitmap *bitmap) { if (bitmap == NULL) return; @@ -551,8 +594,8 @@ inline static void FreeBitmapPointers(Bitmap *bitmap) bitmap->source_filename = NULL; } -inline static void TransferBitmapPointers(Bitmap *src_bitmap, - Bitmap *dst_bitmap) +static void TransferBitmapPointers(Bitmap *src_bitmap, + Bitmap *dst_bitmap) { if (src_bitmap == NULL || dst_bitmap == NULL) return; @@ -580,8 +623,8 @@ Bitmap *CreateBitmapStruct(void) Bitmap *CreateBitmap(int width, int height, int depth) { Bitmap *new_bitmap = CreateBitmapStruct(); - int real_width = MAX(1, width); /* prevent zero bitmap width */ - int real_height = MAX(1, height); /* prevent zero bitmap height */ + int real_width = MAX(1, width); // prevent zero bitmap width + int real_height = MAX(1, height); // prevent zero bitmap height int real_depth = GetRealDepth(depth); SDLCreateBitmapContent(new_bitmap, real_width, real_height, real_depth); @@ -596,12 +639,12 @@ void ReCreateBitmap(Bitmap **bitmap, int width, int height) { if (*bitmap != NULL) { - /* if new bitmap size fits into old one, no need to re-create it */ + // if new bitmap size fits into old one, no need to re-create it if (width <= (*bitmap)->width && height <= (*bitmap)->height) return; - /* else adjust size so that old and new bitmap size fit into it */ + // else adjust size so that old and new bitmap size fit into it width = MAX(width, (*bitmap)->width); height = MAX(height, (*bitmap)->height); } @@ -619,9 +662,11 @@ void ReCreateBitmap(Bitmap **bitmap, int width, int height) } } -void CloseWindow(DrawWindow *window) +#if 0 +static void CloseWindow(DrawWindow *window) { } +#endif void SetRedrawMaskFromArea(int x, int y, int width, int height) { @@ -645,8 +690,8 @@ void SetRedrawMaskFromArea(int x, int y, int width, int height) redraw_mask = REDRAW_ALL; } -inline static boolean CheckDrawingArea(int x, int y, int width, int height, - int draw_mask) +static boolean CheckDrawingArea(int x, int y, int width, int height, + int draw_mask) { if (draw_mask == REDRAW_NONE) return FALSE; @@ -669,7 +714,7 @@ inline static boolean CheckDrawingArea(int x, int y, int width, int height, return FALSE; } -boolean DrawingDeactivatedField() +boolean DrawingDeactivatedField(void) { if (program.headless) return TRUE; @@ -696,7 +741,7 @@ static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y, { int clip_x, clip_y, clip_width, clip_height; - if (gfx.clipping_enabled && is_dest) /* only clip destination bitmap */ + if (gfx.clipping_enabled && is_dest) // only clip destination bitmap { clip_x = MIN(MAX(0, gfx.clip_x), bitmap->width); clip_y = MIN(MAX(0, gfx.clip_y), bitmap->height); @@ -711,7 +756,7 @@ static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y, clip_height = bitmap->height; } - /* skip if rectangle completely outside bitmap */ + // skip if rectangle completely outside bitmap if (*x + *width <= clip_x || *y + *height <= clip_y || @@ -719,7 +764,7 @@ static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y, *y >= clip_y + clip_height) return FALSE; - /* clip if rectangle overlaps bitmap */ + // clip if rectangle overlaps bitmap if (*x < clip_x) { @@ -764,35 +809,34 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, !InClippedRectangle(dst_bitmap, &dst_x, &dst_y, &width, &height, TRUE)) return; - /* source x/y might need adjustment if destination x/y was clipped top/left */ + // source x/y might need adjustment if destination x/y was clipped top/left src_x += dst_x - dst_x_unclipped; src_y += dst_y - dst_y_unclipped; -#if defined(TARGET_SDL2) - /* !!! 2013-12-11: An "old friend" is back. Same bug in SDL2 2.0.1 !!! */ - /* !!! 2009-03-30: Fixed by using self-compiled, patched SDL.dll !!! */ + // !!! 2013-12-11: An "old friend" is back. Same bug in SDL2 2.0.1 !!! + // !!! 2009-03-30: Fixed by using self-compiled, patched SDL.dll !!! /* (This bug still exists in the actual (as of 2009-06-15) version 1.2.13, but is already fixed in SVN and should therefore finally be fixed with the next official SDL release, which is probably version 1.2.14.) */ - /* !!! 2009-03-24: It seems that this problem still exists in 1.2.12 !!! */ + // !!! 2009-03-24: It seems that this problem still exists in 1.2.12 !!! if (src_bitmap == dst_bitmap) { - /* needed when blitting directly to same bitmap -- should not be needed with - recent SDL libraries, but apparently does not work in 1.2.11 directly */ + // needed when blitting directly to same bitmap -- should not be needed with + // recent SDL libraries, but apparently does not work in 1.2.11 directly static Bitmap *tmp_bitmap = NULL; static int tmp_bitmap_xsize = 0; static int tmp_bitmap_ysize = 0; - /* start with largest static bitmaps for initial bitmap size ... */ + // start with largest static bitmaps for initial bitmap size ... if (tmp_bitmap_xsize == 0 && tmp_bitmap_ysize == 0) { tmp_bitmap_xsize = MAX(gfx.win_xsize, gfx.scrollbuffer_width); tmp_bitmap_ysize = MAX(gfx.win_ysize, gfx.scrollbuffer_height); } - /* ... and allow for later re-adjustments due to custom artwork bitmaps */ + // ... and allow for later re-adjustments due to custom artwork bitmaps if (src_bitmap->width > tmp_bitmap_xsize || src_bitmap->height > tmp_bitmap_ysize) { @@ -815,7 +859,6 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, return; } -#endif sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE); @@ -852,7 +895,7 @@ void FadeRectangle(int x, int y, int width, int height, int fade_mode, int fade_delay, int post_delay, void (*draw_border_function)(void)) { - /* (use destination bitmap "backbuffer" -- "bitmap_cross" may be undefined) */ + // (use destination bitmap "backbuffer" -- "bitmap_cross" may be undefined) if (!InClippedRectangle(backbuffer, &x, &y, &width, &height, TRUE)) return; @@ -903,11 +946,11 @@ void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, { if (DrawingOnBackground(dst_x, dst_y)) { - /* draw background */ + // draw background BlitBitmap(gfx.background_bitmap, dst_bitmap, dst_x, dst_y, width, height, dst_x, dst_y); - /* draw foreground */ + // draw foreground BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y); } @@ -978,8 +1021,8 @@ void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL); } -void DrawLine(Bitmap *bitmap, int from_x, int from_y, - int to_x, int to_y, Pixel pixel, int line_width) +static void DrawLine(Bitmap *bitmap, int from_x, int from_y, + int to_x, int to_y, Pixel pixel, int line_width) { int x, y; @@ -1051,23 +1094,12 @@ Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) void KeyboardAutoRepeatOn(void) { -#if defined(TARGET_SDL2) keyrepeat_status = TRUE; -#else - SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2, - SDL_DEFAULT_REPEAT_INTERVAL / 2); - SDL_EnableUNICODE(1); -#endif } void KeyboardAutoRepeatOff(void) { -#if defined(TARGET_SDL2) keyrepeat_status = FALSE; -#else - SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); - SDL_EnableUNICODE(0); -#endif } boolean SetVideoMode(boolean fullscreen) @@ -1080,7 +1112,7 @@ void SetVideoFrameDelay(unsigned int frame_delay_value) video.frame_delay_value = frame_delay_value; } -unsigned int GetVideoFrameDelay() +unsigned int GetVideoFrameDelay(void) { return video.frame_delay_value; } @@ -1125,7 +1157,7 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) char *filename = getCustomImageFilename(basename); Bitmap *new_bitmap; - if (filename == NULL) /* (should never happen) */ + if (filename == NULL) // (should never happen) { Error(ERR_WARN, "ReloadCustomImage(): cannot find file '%s'", basename); return; @@ -1133,9 +1165,9 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) if (strEqual(filename, bitmap->source_filename)) { - /* The old and new image are the same (have the same filename and path). - This usually means that this image does not exist in this graphic set - and a fallback to the existing image is done. */ + // The old and new image are the same (have the same filename and path). + // This usually means that this image does not exist in this graphic set + // and a fallback to the existing image is done. return; } @@ -1218,12 +1250,12 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, old_width = old_bitmap->width; old_height = old_bitmap->height; - /* calculate new image dimensions for final image size */ + // calculate new image dimensions for final image size width_final = old_width * zoom_factor; height_final = old_height * zoom_factor; - /* get image with final size (this might require scaling up) */ - /* ("final" size may result in non-standard tile size image) */ + // get image with final size (this might require scaling up) + // ("final" size may result in non-standard tile size image) if (zoom_factor != 1) tmp_bitmap_final = ZoomBitmap(old_bitmap, width_final, height_final); else @@ -1238,10 +1270,10 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, if (create_small_bitmaps) { - /* check if we have a non-gameplay tile size image */ + // check if we have a non-gameplay tile size image if (tile_size != gfx.game_tile_size) { - /* get image with gameplay tile size */ + // get image with gameplay tile size width_0 = width_final * gfx.game_tile_size / tile_size; height_0 = height_final * gfx.game_tile_size / tile_size; @@ -1255,10 +1287,10 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); } - /* check if we have a non-standard tile size image */ + // check if we have a non-standard tile size image if (tile_size != gfx.standard_tile_size) { - /* get image with standard tile size */ + // get image with standard tile size width_1 = width_final * gfx.standard_tile_size / tile_size; height_1 = height_final * gfx.standard_tile_size / tile_size; @@ -1274,7 +1306,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); } - /* calculate new image dimensions for small images */ + // calculate new image dimensions for small images width_2 = width_1 / 2; height_2 = height_1 / 2; width_4 = width_1 / 4; @@ -1286,7 +1318,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, width_32 = width_1 / 32; height_32 = height_1 / 32; - /* get image with 1/2 of normal size (for use in the level editor) */ + // get image with 1/2 of normal size (for use in the level editor) if (width_2 == old_width) tmp_bitmap_2 = old_bitmap; else @@ -1294,7 +1326,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); - /* get image with 1/4 of normal size (for use in the level editor) */ + // get image with 1/4 of normal size (for use in the level editor) if (width_4 == old_width) tmp_bitmap_4 = old_bitmap; else @@ -1302,7 +1334,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); - /* get image with 1/8 of normal size (for use on the preview screen) */ + // get image with 1/8 of normal size (for use on the preview screen) if (width_8 == old_width) tmp_bitmap_8 = old_bitmap; else @@ -1310,7 +1342,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); - /* get image with 1/16 of normal size (for use on the preview screen) */ + // get image with 1/16 of normal size (for use on the preview screen) if (width_16 == old_width) tmp_bitmap_16 = old_bitmap; else @@ -1318,7 +1350,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); - /* get image with 1/32 of normal size (for use on the preview screen) */ + // get image with 1/32 of normal size (for use on the preview screen) if (width_32 == old_width) tmp_bitmap_32 = old_bitmap; else @@ -1348,7 +1380,13 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, free_old_bitmap = FALSE; if (free_old_bitmap) + { + // copy image filename from old to new standard sized bitmap + bitmaps[IMG_BITMAP_STANDARD]->source_filename = + getStringCopy(old_bitmap->source_filename); + FreeBitmap(old_bitmap); + } } else { @@ -1382,24 +1420,24 @@ void ScaleBitmap(Bitmap **bitmaps, int zoom_factor) } -/* ------------------------------------------------------------------------- */ -/* mouse pointer functions */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// mouse pointer functions +// ---------------------------------------------------------------------------- #define USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER 0 -/* XPM image definitions */ +// XPM image definitions static const char *cursor_image_none[] = { - /* width height num_colors chars_per_pixel */ + // width height num_colors chars_per_pixel " 16 16 3 1", - /* colors */ + // colors "X c #000000", ". c #ffffff", " c None", - /* pixels */ + // pixels " ", " ", " ", @@ -1417,22 +1455,22 @@ static const char *cursor_image_none[] = " ", " ", - /* hot spot */ + // hot spot "0,0" }; #if USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER static const char *cursor_image_dot[] = { - /* width height num_colors chars_per_pixel */ + // width height num_colors chars_per_pixel " 16 16 3 1", - /* colors */ + // colors "X c #000000", ". c #ffffff", " c None", - /* pixels */ + // pixels " X ", "X.X ", " X ", @@ -1450,13 +1488,13 @@ static const char *cursor_image_dot[] = " ", " ", - /* hot spot */ + // hot spot "1,1" }; static const char **cursor_image_playfield = cursor_image_dot; #else -/* some people complained about a "white dot" on the screen and thought it - was a graphical error... OK, let's just remove the whole pointer :-) */ +// some people complained about a "white dot" on the screen and thought it +// was a graphical error... OK, let's just remove the whole pointer :-) static const char **cursor_image_playfield = cursor_image_none; #endif @@ -1531,13 +1569,13 @@ void SetMouseCursor(int mode) } -/* ========================================================================= */ -/* audio functions */ -/* ========================================================================= */ +// ============================================================================ +// audio functions +// ============================================================================ void OpenAudio(void) { - /* always start with reliable default values */ + // always start with reliable default values audio.sound_available = FALSE; audio.music_available = FALSE; audio.loops_available = FALSE; @@ -1573,9 +1611,9 @@ void SetAudioMode(boolean enabled) } -/* ========================================================================= */ -/* event functions */ -/* ========================================================================= */ +// ============================================================================ +// event functions +// ============================================================================ boolean PendingEvent(void) { @@ -1589,11 +1627,7 @@ void WaitEvent(Event *event) void PeekEvent(Event *event) { -#if defined(TARGET_SDL2) SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT); -#else - SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_ALLEVENTS); -#endif } void CheckQuitEvent(void) @@ -1604,33 +1638,15 @@ void CheckQuitEvent(void) Key GetEventKey(KeyEvent *event, boolean with_modifiers) { -#if defined(TARGET_SDL2) - /* key up/down events in SDL2 do not return text characters anymore */ + // key up/down events in SDL2 do not return text characters anymore return event->keysym.sym; -#else - -#if ENABLE_UNUSED_CODE - printf("unicode == '%d', sym == '%d', mod == '0x%04x'\n", - (int)event->keysym.unicode, - (int)event->keysym.sym, - (int)SDL_GetModState()); -#endif - - if (with_modifiers && - event->keysym.unicode > 0x0000 && - event->keysym.unicode < 0x2000) - return event->keysym.unicode; - else - return event->keysym.sym; - -#endif } KeyMod HandleKeyModState(Key key, int key_status) { static KeyMod current_modifiers = KMOD_None; - if (key != KSYM_UNDEFINED) /* new key => check for modifier key change */ + if (key != KSYM_UNDEFINED) // new key => check for modifier key change { KeyMod new_modifier = KMOD_None; @@ -1673,12 +1689,12 @@ KeyMod HandleKeyModState(Key key, int key_status) return current_modifiers; } -KeyMod GetKeyModState() +KeyMod GetKeyModState(void) { return (KeyMod)SDL_GetModState(); } -KeyMod GetKeyModStateFromEvents() +KeyMod GetKeyModStateFromEvents(void) { /* always use key modifier state as tracked from key events (this is needed if the modifier key event was injected into the event queue, but the key @@ -1691,7 +1707,6 @@ KeyMod GetKeyModStateFromEvents() void StartTextInput(int x, int y, int width, int height) { -#if defined(TARGET_SDL2) #if defined(HAS_SCREEN_KEYBOARD) SDL_StartTextInput(); @@ -1702,12 +1717,10 @@ void StartTextInput(int x, int y, int width, int height) video.shifted_up = TRUE; } #endif -#endif } -void StopTextInput() +void StopTextInput(void) { -#if defined(TARGET_SDL2) #if defined(HAS_SCREEN_KEYBOARD) SDL_StopTextInput(); @@ -1718,34 +1731,39 @@ void StopTextInput() video.shifted_up = FALSE; } #endif -#endif } -boolean CheckCloseWindowEvent(ClientMessageEvent *event) +void PushUserEvent(int code, int value1, int value2) { - if (event->type != EVENT_CLIENTMESSAGE) - return FALSE; + UserEvent event; - return TRUE; /* the only possible message here is SDL_QUIT */ + SDL_memset(&event, 0, sizeof(event)); + + event.type = EVENT_USER; + event.code = code; + event.value1 = value1; + event.value2 = value2; + + SDL_PushEvent((SDL_Event *)&event); } -/* ========================================================================= */ -/* joystick functions */ -/* ========================================================================= */ +// ============================================================================ +// joystick functions +// ============================================================================ -void InitJoysticks() +void InitJoysticks(void) { int i; #if defined(NO_JOYSTICK) - return; /* joysticks generally deactivated by compile-time directive */ + return; // joysticks generally deactivated by compile-time directive #endif - /* always start with reliable default values */ + // always start with reliable default values joystick.status = JOYSTICK_NOT_AVAILABLE; for (i = 0; i < MAX_PLAYERS; i++) - joystick.nr[i] = -1; /* no joystick configured */ + joystick.nr[i] = -1; // no joystick configured SDLInitJoysticks(); } @@ -1760,7 +1778,7 @@ boolean CheckJoystickOpened(int nr) return SDLCheckJoystickOpened(nr); } -void ClearJoystickState() +void ClearJoystickState(void) { SDLClearJoystickState(); }