OSDN Git Service

[Fix] #40236 Resolved compilation warnings in cmd-inn.c
authorHourier <hourier@users.sourceforge.jp>
Sat, 25 Apr 2020 03:42:32 +0000 (12:42 +0900)
committerHourier <hourier@users.sourceforge.jp>
Sat, 25 Apr 2020 03:42:32 +0000 (12:42 +0900)
src/cmd/cmd-inn.c

index 46f67f6..299b715 100644 (file)
@@ -62,13 +62,13 @@ static void write_diary_stay_inn(player_type *customer_ptr, int prev_hour)
 {
        if ((prev_hour >= 6) && (prev_hour < 18))
        {
-               concptr stay_message_jp = is_player_undead(customer_ptr) ? "宿屋に泊まった。" : "日が暮れるまで宿屋で過ごした。";
-               exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _(stay_message_jp, "stayed during the day at the inn."));
+               concptr stay_message = _(is_player_undead(customer_ptr) ? "宿屋に泊まった。" : "日が暮れるまで宿屋で過ごした。", "stayed during the day at the inn.");
+               exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, stay_message);
                return;
        }
 
-       concptr stay_message_jp = is_player_undead(customer_ptr) ? "夜が明けるまで宿屋で過ごした。" : "宿屋に泊まった。";
-       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _(stay_message_jp, "stayed overnight at the inn."));
+       concptr stay_message = _(is_player_undead(customer_ptr) ? "夜が明けるまで宿屋で過ごした。" : "宿屋に泊まった。", "stayed overnight at the inn.");
+       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, stay_message);
 }
 
 
@@ -162,17 +162,21 @@ static void display_stay_result(player_type *customer_ptr, int prev_hour)
 {
        if ((prev_hour >= 6) && (prev_hour < 18))
        {
+#if JP
                char refresh_message_jp[50];
                sprintf(refresh_message_jp, "%s%s%s", "あなたはリフレッシュして目覚め、", is_player_undead(customer_ptr) ? "夜" : "夕方", "を迎えた。");
-               msg_print(_(refresh_message_jp, "You awake refreshed for the evening."));
-               concptr awake_message_jp = is_player_undead(customer_ptr) ? "すがすがしい夜を迎えた。" : "夕方を迎えた。";
-               exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _(awake_message_jp, "awoke refreshed."));
+               msg_print(refresh_message_jp);
+#else
+               msg_print("You awake refreshed for the evening.");
+#endif
+               concptr awake_message = _(is_player_undead(customer_ptr) ? "すがすがしい夜を迎えた。" : "夕方を迎えた。", "awoke refreshed.");
+               exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, awake_message);
                return;
        }
 
        msg_print(_("あなたはリフレッシュして目覚め、新たな日を迎えた。", "You awake refreshed for the new day."));
-       concptr awake_message_jp = is_player_undead(customer_ptr) ? "すがすがしい朝を迎えた。" : "朝を迎えた。";
-       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _(awake_message_jp, "awoke refreshed."));
+       concptr awake_message = _(is_player_undead(customer_ptr) ? "すがすがしい朝を迎えた。" : "朝を迎えた。", "awoke refreshed.");
+       exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, awake_message);
 }