X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=ed51e626a8f473747e4b9644c532f95e76b9b490;hb=499ad3bb12d513266ddcebe41a84eee8237a7fb5;hp=4d4c448f486755e90a03f97dcc6608d1d3ef1793;hpb=b6dd2f35e987ab55a904deff37194ee8507c7d7a;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 4d4c448f..ed51e626 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -68,7 +68,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); @@ -92,6 +92,8 @@ void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, 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; @@ -329,6 +331,11 @@ void SetDrawDeactivationMask(int draw_deactivation_mask) gfx.draw_deactivation_mask = draw_deactivation_mask; } +int GetDrawDeactivationMask() +{ + return gfx.draw_deactivation_mask; +} + void SetDrawBackgroundMask(int draw_background_mask) { gfx.draw_background_mask = draw_background_mask; @@ -1578,9 +1585,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); @@ -1594,9 +1601,9 @@ void StartTextInput(int x, int y, int width, int height) void StopTextInput() { #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;