projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added using setup option for displaying overlay touch buttons
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index a5e8a58e8ddcf06878c005a70662557871080a2d..a4c95d26d0cabc1219aabfc2b98624155df29c2b 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-32,6
+32,7
@@
DrawBuffer *drawto_field;
int game_status = -1;
int game_status_last_screen = -1;
boolean level_editor_test_game = FALSE;
int game_status = -1;
int game_status_last_screen = -1;
boolean level_editor_test_game = FALSE;
+boolean score_info_tape_play = FALSE;
boolean network_playing = FALSE;
int key_joystick_mapping = 0;
boolean network_playing = FALSE;
int key_joystick_mapping = 0;
@@
-177,6
+178,7
@@
SetupFileHash *element_token_hash = NULL;
SetupFileHash *graphic_token_hash = NULL;
SetupFileHash *font_token_hash = NULL;
SetupFileHash *hide_setup_hash = NULL;
SetupFileHash *graphic_token_hash = NULL;
SetupFileHash *font_token_hash = NULL;
SetupFileHash *hide_setup_hash = NULL;
+SetupFileHash *anim_url_hash = NULL;
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
@@
-7797,9
+7799,6
@@
static void InitProgramConfig(char *command_filename)
char *config_filename = getProgramConfigFilename(command_filename);
char *userdata_basename = getBaseNameNoSuffix(command_filename);
char *userdata_subdir;
char *config_filename = getProgramConfigFilename(command_filename);
char *userdata_basename = getBaseNameNoSuffix(command_filename);
char *userdata_subdir;
-#if defined(PLATFORM_UNIX)
- char *userdata_subdir_unix;
-#endif
// read default program config, if existing
if (fileExists(config_filename))
// read default program config, if existing
if (fileExists(config_filename))
@@
-7817,11
+7816,6
@@
static void InitProgramConfig(char *command_filename)
LoadSetupFromFilename(config_filename);
}
LoadSetupFromFilename(config_filename);
}
-#if defined(PLATFORM_UNIX)
- // set user data directory for Linux/Unix (but not Mac OS X)
- userdata_subdir_unix = getStringCat2(".", userdata_basename);
-#endif
-
// set program title from potentially redefined program title
if (setup.internal.program_title != NULL &&
strlen(setup.internal.program_title) > 0)
// set program title from potentially redefined program title
if (setup.internal.program_title != NULL &&
strlen(setup.internal.program_title) > 0)
@@
-7837,10
+7831,10
@@
static void InitProgramConfig(char *command_filename)
strlen(setup.internal.program_icon_file) > 0)
program_icon_file = getStringCopy(setup.internal.program_icon_file);
strlen(setup.internal.program_icon_file) > 0)
program_icon_file = getStringCopy(setup.internal.program_icon_file);
-#if defined(PLATFORM_WIN
32) || defined(PLATFORM_MACOSX
)
+#if defined(PLATFORM_WIN
DOWS) || defined(PLATFORM_MAC) || defined(PLATFORM_EMSCRIPTEN
)
userdata_subdir = program_title;
#elif defined(PLATFORM_UNIX)
userdata_subdir = program_title;
#elif defined(PLATFORM_UNIX)
- userdata_subdir =
userdata_subdir_unix
;
+ userdata_subdir =
getStringCat2(".", userdata_basename)
;
#else
userdata_subdir = USERDATA_DIRECTORY_OTHER;
#endif
#else
userdata_subdir = USERDATA_DIRECTORY_OTHER;
#endif