X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=0e3a272866f59408483af20003bb8ada148ad03a;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hp=5b7cede45da7a2932ca770d4bc9722b85eac13ed;hpb=6cf6b75d5b9c84476a121cfd2ff11a0351ecba47;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 5b7cede4..0e3a2728 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -29,6 +29,7 @@ /* ========================================================================= */ struct ProgramInfo program; +struct NetworkInfo network; struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; @@ -44,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; @@ -103,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) @@ -124,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(); @@ -292,7 +307,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 +316,12 @@ void InitGfxCustomArtworkInfo() gfx.draw_init_text = TRUE; } -void InitGfxOtherSettings() +void InitGfxOtherSettings(void) { gfx.cursor_mode = CURSOR_DEFAULT; } -void InitTileCursorInfo() +void InitTileCursorInfo(void) { tile_cursor.enabled = FALSE; tile_cursor.active = FALSE; @@ -323,63 +338,27 @@ void InitTileCursorInfo() tile_cursor.sy = 0; } -void InitOverlayInfo() +void InitOverlayInfo(void) { - static char *default_grid_button[6][2] = - { - { " ", " ^^ " }, - { " ", " ^^ " }, - { " ", "<< >>" }, - { " ", "<< >>" }, - { "111222", " vv " }, - { "111222", " vv " } - }; int nr = GRID_ACTIVE_NR(); - int i, x, y; + int x, y; overlay.enabled = FALSE; overlay.active = FALSE; overlay.show_grid = FALSE; - overlay.show_grid_buttons = FALSE; - for (i = 0; i < 2; i++) - { - int grid_xsize = DEFAULT_GRID_XSIZE(i); - int grid_ysize = DEFAULT_GRID_YSIZE(i); - int min_xsize = MIN(6, grid_xsize); - int min_ysize = MIN(6, grid_ysize); - int startx = grid_xsize - min_xsize; - int starty = grid_ysize - min_ysize; - - overlay.grid_xsize_all[i] = grid_xsize; - overlay.grid_ysize_all[i] = grid_ysize; - - for (x = 0; x < MAX_GRID_XSIZE; x++) - for (y = 0; y < MAX_GRID_YSIZE; y++) - overlay.grid_button_all[i][x][y] = CHAR_GRID_BUTTON_NONE; - - for (x = 0; x < min_xsize; x++) - for (y = 0; y < min_ysize; y++) - overlay.grid_button_all[i][x][starty + y] = - default_grid_button[y][0][x]; - - for (x = 0; x < min_xsize; x++) - for (y = 0; y < min_ysize; y++) - overlay.grid_button_all[i][startx + x][starty + y] = - default_grid_button[y][1][x]; - } - - overlay.grid_xsize = overlay.grid_xsize_all[nr]; - overlay.grid_ysize = overlay.grid_ysize_all[nr]; + 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] = overlay.grid_button_all[nr][x][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(PLATFORM_ANDROID) +#if defined(USE_TOUCH_INPUT_OVERLAY) if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) overlay.enabled = TRUE; #endif @@ -439,7 +418,6 @@ void SetOverlayActive(boolean active) void SetOverlayShowGrid(boolean show_grid) { overlay.show_grid = show_grid; - overlay.show_grid_buttons = show_grid; SetOverlayActive(show_grid); @@ -447,7 +425,7 @@ void SetOverlayShowGrid(boolean show_grid) SetOverlayEnabled(TRUE); } -boolean GetOverlayActive() +boolean GetOverlayActive(void) { return overlay.active; } @@ -457,7 +435,7 @@ void SetDrawDeactivationMask(int draw_deactivation_mask) gfx.draw_deactivation_mask = draw_deactivation_mask; } -int GetDrawDeactivationMask() +int GetDrawDeactivationMask(void) { return gfx.draw_deactivation_mask; } @@ -731,7 +709,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; @@ -1142,7 +1120,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; } @@ -1410,7 +1388,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 { @@ -1735,12 +1719,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 @@ -1767,7 +1751,7 @@ 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) @@ -1796,7 +1780,7 @@ boolean CheckCloseWindowEvent(ClientMessageEvent *event) /* joystick functions */ /* ========================================================================= */ -void InitJoysticks() +void InitJoysticks(void) { int i; @@ -1822,7 +1806,7 @@ boolean CheckJoystickOpened(int nr) return SDLCheckJoystickOpened(nr); } -void ClearJoystickState() +void ClearJoystickState(void) { SDLClearJoystickState(); }