X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=64f67a179593cbd844576d746892c5a9fc17d489;hp=5ccf3fb3784650147bc1f70aed77af72925dd0bb;hb=30eb586d06bc4d1ee7388dced1c20e530292aa93;hpb=cea8726203188984c5d94dc15934d1e186d18c37 diff --git a/src/libgame/system.c b/src/libgame/system.c index 5ccf3fb3..64f67a17 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -29,10 +29,12 @@ /* ========================================================================= */ struct ProgramInfo program; +struct NetworkInfo network; struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; +struct TileCursorInfo tile_cursor; struct OverlayInfo overlay; struct ArtworkInfo artwork; struct JoystickInfo joystick; @@ -43,6 +45,7 @@ LevelDirTree *leveldir_first = NULL; LevelDirTree *leveldir_current = NULL; int level_nr; +struct LevelSetInfo levelset; struct LevelStats level_stats[MAX_LEVELS]; DrawWindow *window = NULL; @@ -68,7 +71,7 @@ int FrameCounter = 0; void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, char *program_title, char *icon_title, char *icon_filename, char *cookie_prefix, - int program_version) + char *program_version_string, int program_version) { program.command_basepath = getBasePath(argv0); program.command_basename = getBaseName(argv0); @@ -86,12 +89,14 @@ 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; + 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; @@ -100,13 +105,25 @@ 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 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) @@ -121,11 +138,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(); @@ -284,7 +302,12 @@ void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int)) gfx.draw_global_border_function = draw_global_border_function; } -void InitGfxCustomArtworkInfo() +void InitGfxDrawTileCursorFunction(void (*draw_tile_cursor_function)(int)) +{ + gfx.draw_tile_cursor_function = draw_tile_cursor_function; +} + +void InitGfxCustomArtworkInfo(void) { gfx.override_level_graphics = FALSE; gfx.override_level_sounds = FALSE; @@ -293,14 +316,98 @@ void InitGfxCustomArtworkInfo() gfx.draw_init_text = TRUE; } -void InitGfxOtherSettings() +void InitGfxOtherSettings(void) { gfx.cursor_mode = CURSOR_DEFAULT; } -void InitOverlayInfo() +void InitTileCursorInfo(void) { + tile_cursor.enabled = FALSE; + tile_cursor.active = FALSE; + tile_cursor.moving = FALSE; + + tile_cursor.xpos = 0; + tile_cursor.ypos = 0; + tile_cursor.x = 0; + tile_cursor.y = 0; + tile_cursor.target_x = 0; + tile_cursor.target_y = 0; + + tile_cursor.sx = 0; + tile_cursor.sy = 0; +} + +void InitOverlayInfo(void) +{ + int nr = GRID_ACTIVE_NR(); + int x, y; + + overlay.enabled = FALSE; overlay.active = FALSE; + + 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 +} + +void SetTileCursorEnabled(boolean enabled) +{ + tile_cursor.enabled = enabled; +} + +void SetTileCursorActive(boolean active) +{ + tile_cursor.active = active; +} + +void SetTileCursorTargetXY(int x, int y) +{ + // delayed placement of tile selection cursor at target position + // (tile cursor will be moved to target position step by step) + + tile_cursor.xpos = x; + tile_cursor.ypos = y; + tile_cursor.target_x = tile_cursor.sx + x * gfx.game_tile_size; + tile_cursor.target_y = tile_cursor.sy + y * gfx.game_tile_size; + + tile_cursor.moving = TRUE; +} + +void SetTileCursorXY(int x, int y) +{ + // immediate placement of tile selection cursor at target position + + SetTileCursorTargetXY(x, y); + + tile_cursor.x = tile_cursor.target_x; + tile_cursor.y = tile_cursor.target_y; + + tile_cursor.moving = FALSE; +} + +void SetTileCursorSXSY(int sx, int sy) +{ + tile_cursor.sx = sx; + tile_cursor.sy = sy; +} + +void SetOverlayEnabled(boolean enabled) +{ + overlay.enabled = enabled; } void SetOverlayActive(boolean active) @@ -308,7 +415,17 @@ 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 GetOverlayActive(void) { return overlay.active; } @@ -318,12 +435,17 @@ void SetDrawDeactivationMask(int draw_deactivation_mask) gfx.draw_deactivation_mask = draw_deactivation_mask; } +int GetDrawDeactivationMask(void) +{ + return gfx.draw_deactivation_mask; +} + 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; @@ -403,6 +525,11 @@ void LimitScreenUpdates(boolean enable) SDLLimitScreenUpdates(enable); } +void InitVideoDefaults(void) +{ + video.default_depth = 32; +} + void InitVideoDisplay(void) { if (program.headless) @@ -448,7 +575,7 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen) SDLInitVideoBuffer(fullscreen); - video.initialized = TRUE; + video.initialized = !program.headless; drawto = backbuffer; } @@ -507,6 +634,18 @@ Bitmap *CreateBitmap(int width, int height, int depth) 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 (width <= (*bitmap)->width && + height <= (*bitmap)->height) + return; + + /* else adjust size so that old and new bitmap size fit into it */ + width = MAX(width, (*bitmap)->width); + height = MAX(height, (*bitmap)->height); + } + Bitmap *new_bitmap = CreateBitmap(width, height, DEFAULT_DEPTH); if (*bitmap == NULL) @@ -520,9 +659,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) { @@ -570,6 +711,17 @@ inline static boolean CheckDrawingArea(int x, int y, int width, int height, return FALSE; } +boolean DrawingDeactivatedField(void) +{ + if (program.headless) + return TRUE; + + if (gfx.draw_deactivation_mask & REDRAW_FIELD) + return TRUE; + + return FALSE; +} + boolean DrawingDeactivated(int x, int y, int width, int height) { return CheckDrawingArea(x, y, width, height, gfx.draw_deactivation_mask); @@ -868,11 +1020,14 @@ 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; + if (program.headless) + return; + for (x = 0; x < line_width; x++) { for (y = 0; y < line_width; y++) @@ -908,6 +1063,9 @@ void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, Pixel pixel) Pixel GetPixel(Bitmap *bitmap, int x, int y) { + if (program.headless) + return BLACK_PIXEL; + if (x < 0 || x >= bitmap->width || y < 0 || y >= bitmap->height) return BLACK_PIXEL; @@ -918,6 +1076,9 @@ Pixel GetPixel(Bitmap *bitmap, int x, int y) Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, unsigned int color_g, unsigned int color_b) { + if (program.headless) + return BLACK_PIXEL; + return SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b); } @@ -961,7 +1122,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; } @@ -1229,7 +1390,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 { @@ -1463,9 +1630,9 @@ boolean PendingEvent(void) return (SDL_PollEvent(NULL) ? TRUE : FALSE); } -void NextEvent(Event *event) +void WaitEvent(Event *event) { - SDLNextEvent(event); + SDLWaitEvent(event); } void PeekEvent(Event *event) @@ -1477,6 +1644,12 @@ void PeekEvent(Event *event) #endif } +void CheckQuitEvent(void) +{ + if (SDL_QuitRequested()) + program.exit_function(0); +} + Key GetEventKey(KeyEvent *event, boolean with_modifiers) { #if defined(TARGET_SDL2) @@ -1548,12 +1721,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 @@ -1567,9 +1740,9 @@ KeyMod GetKeyModStateFromEvents() void StartTextInput(int x, int y, int width, int height) { #if defined(TARGET_SDL2) +#if defined(HAS_SCREEN_KEYBOARD) SDL_StartTextInput(); -#if defined(HAS_SCREEN_KEYBOARD) if (y + height > SCREEN_KEYBOARD_POS(video.height)) { video.shifted_up_pos = y + height - SCREEN_KEYBOARD_POS(video.height); @@ -1580,12 +1753,12 @@ void StartTextInput(int x, int y, int width, int height) #endif } -void StopTextInput() +void StopTextInput(void) { #if defined(TARGET_SDL2) +#if defined(HAS_SCREEN_KEYBOARD) SDL_StopTextInput(); -#if defined(HAS_SCREEN_KEYBOARD) if (video.shifted_up) { video.shifted_up_pos = 0; @@ -1609,7 +1782,7 @@ boolean CheckCloseWindowEvent(ClientMessageEvent *event) /* joystick functions */ /* ========================================================================= */ -void InitJoysticks() +void InitJoysticks(void) { int i; @@ -1634,3 +1807,8 @@ boolean CheckJoystickOpened(int nr) { return SDLCheckJoystickOpened(nr); } + +void ClearJoystickState(void) +{ + SDLClearJoystickState(); +}