Max/nunuhara_xsystem4
1
0
Fork 0
mirror of https://github.com/nunuhara/xsystem4.git synced 2026-10-07 22:38:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolve game config paths relative to game dir

Browse Source 
Game-specific .xsys4rc files are loaded from the game directory, so
relative paths in that file are most useful when interpreted from the
same directory. This allows patches that ship external fonts to
reference them with relative paths.
This commit is contained in:
kichikuou
2026-07-05 08:03:29 +09:00
parent bf3b3416fe
commit 05fee4ba83
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system4.c
+19 -7
View File
@@ -158,7 +158,16 @@ static bool read_config(const char *path)
return true;
}
static void read_user_config_file(const char *path)
static char *user_config_path(struct ini_entry *entry, const char *basedir)
{
const char *path = ini_string(entry)->text;
if (basedir && !is_absolute_path(path)) {
return path_join(basedir, path);
}
return xstrdup(path);
}
static void read_user_config_file(const char *path, const char *basedir)
{
int ini_size;
struct ini_entry *ini = ini_parse(path, &ini_size);
@@ -167,11 +176,14 @@ static void read_user_config_file(const char *path)
for (int i = 0; i < ini_size; i++) {
if (!strcmp(ini[i].name->text, "font-mincho")) {
config.font_paths[FONT_MINCHO] = xstrdup(ini_string(&ini[i])->text);
free(config.font_paths[FONT_MINCHO]);
config.font_paths[FONT_MINCHO] = user_config_path(&ini[i], basedir);
} else if (!strcmp(ini[i].name->text, "font-gothic")) {
config.font_paths[FONT_GOTHIC] = xstrdup(ini_string(&ini[i])->text);
free(config.font_paths[FONT_GOTHIC]);
config.font_paths[FONT_GOTHIC] = user_config_path(&ini[i], basedir);
} else if (!strcmp(ini[i].name->text, "font-fnl")) {
config.fnl_path = xstrdup(ini_string(&ini[i])->text);
free(config.fnl_path);
config.fnl_path = user_config_path(&ini[i], basedir);
} else if (!strcmp(ini[i].name->text, "font-x-scale")) {
float f = strtof(ini_string(&ini[i])->text, NULL);
if (fabsf(f) < 0.01) {
@@ -190,7 +202,7 @@ static void read_user_config_file(const char *path)
}
} else if (!strcmp(ini[i].name->text, "save-folder")) {
free(config.save_dir);
config.save_dir = xstrdup(ini_string(&ini[i])->text);
config.save_dir = user_config_path(&ini[i], basedir);
} else if (!strcmp(ini[i].name->text, "save-format")) {
if (!strcmp(ini_string(&ini[i])->text, "json")) {
config.save_format = SAVE_FORMAT_JSON;
@@ -213,12 +225,12 @@ static void read_user_config(void)
// global config
path = xmalloc(PATH_MAX);
snprintf(path, PATH_MAX-1, "%s/.xsys4rc", config.home_dir);
read_user_config_file(path);
read_user_config_file(path, NULL);
free(path);
// game-specific config
path = gamedir_path(".xsys4rc");
read_user_config_file(path);
read_user_config_file(path, config.game_dir);
free(path);
}