From 8fff5c35bcc0940cc25c823cb144e6cfd2d74ae8 Mon Sep 17 00:00:00 2001 From: Hourier Date: Tue, 3 Nov 2020 21:51:03 +0900 Subject: [PATCH] =?utf8?q?[Fix]=20#40913=20Windows=E4=BB=A5=E5=A4=96?= =?utf8?q?=E3=81=A7=E6=96=B0=E8=A6=8F=E3=81=AE=E3=82=BB=E3=83=BC=E3=83=96?= =?utf8?q?=E3=83=87=E3=83=BC=E3=82=BF=E3=82=92=E4=BD=9C=E6=88=90=E3=81=A7?= =?utf8?q?=E3=81=8D=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?= =?utf8?q?=E8=A7=A3=E6=B6=88=E3=81=97=E3=81=9F=20/=20Resolved=20the=20issu?= =?utf8?q?e=20that=20new=20game=20couldn't=20be=20started=20in=20non-Windo?= =?utf8?q?ws=20environment?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/core/game-play.c | 2 +- src/load/load.c | 7 +++++-- src/load/load.h | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/core/game-play.c b/src/core/game-play.c index 03f511ccf..0cf2c9a14 100644 --- a/src/core/game-play.c +++ b/src/core/game-play.c @@ -397,7 +397,7 @@ void play_game(player_type *player_ptr, bool new_game, bool browsing_movie) } restore_windows(player_ptr); - if (!load_savedata(player_ptr)) + if (!load_savedata(player_ptr, &new_game)) quit(_("セーブファイルが壊れています", "broken savefile")); extract_option_vars(); diff --git a/src/load/load.c b/src/load/load.c index 3f6d791c5..c79540778 100644 --- a/src/load/load.c +++ b/src/load/load.c @@ -264,7 +264,7 @@ static errr rd_savefile(player_type *player_ptr) * @param new_game セーブデータの新規作成が必要か否か * @return セーブデータが読み込めればtrue */ -bool load_savedata(player_type *player_ptr) +bool load_savedata(player_type *player_ptr, bool *new_game) { concptr what = "generic"; current_world_ptr->game_turn = 0; @@ -272,10 +272,13 @@ bool load_savedata(player_type *player_ptr) if (!savefile[0]) return TRUE; -#ifndef WINDOWS +#ifdef WINDOWS + (void)new_game; +#else if (access(savefile, 0) < 0) { msg_print(_("セーブファイルがありません。", "Savefile does not exist.")); msg_print(NULL); + *new_game = TRUE; return TRUE; } #endif diff --git a/src/load/load.h b/src/load/load.h index d53c6ef13..2b53bb70b 100644 --- a/src/load/load.h +++ b/src/load/load.h @@ -3,4 +3,4 @@ #include "floor/floor-save.h" #include "system/angband.h" -bool load_savedata(player_type *player_ptr); +bool load_savedata(player_type *player_ptr, bool *new_game); -- 2.11.0