From d777b18b550ba3e2f116bd4fa530859ccabacca9 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sat, 11 Jul 2020 11:56:19 +0900 Subject: [PATCH] Game Resource: Allow file names containing spaces --- src/gameresource.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gameresource.c b/src/gameresource.c index 3d22053..84d6410 100644 --- a/src/gameresource.c +++ b/src/gameresource.c @@ -144,7 +144,11 @@ static boolean sys35_initGameDataDir(int* cnt) return FALSE; } - +static void trim_right(char *str) { + for (char *p = str + strlen(str) - 1; p >= str && isspace(*p); p--) + *p = '\0'; +} + /* ゲームのデータファイルの情報を読み込む */ boolean initGameDataResorce(const char *gameResourceFile) { int cnt[] = {0, 0, 0, 0, 0, 0, 0}; @@ -163,8 +167,9 @@ boolean initGameDataResorce(const char *gameResourceFile) { linecnt++; if (s[0] == '#') continue; s2[0] = '\0'; - sscanf(s,"%s %s", s1, s2); + sscanf(s,"%s %[^\n]", s1, s2); if (s2[0] == '\0') continue; + trim_right(s2); if (0 == strncmp(s1, "Scenario", 8)) { dno = s1[8] - 'A'; if (dno < 0 || dno >= DRIFILEMAX) goto errexit;