OSDN Git Service

Merge pull request #40 from hengband/feature/english-rumor
[hengbandforosx/hengbandosx.git] / src / player / player-damage.c
index 4551599..3489ef3 100644 (file)
@@ -20,6 +20,7 @@
 #include "game-option/special-options.h"
 #include "inventory/inventory-damage.h"
 #include "inventory/inventory-slot-types.h"
+#include "io/files-util.h"
 #include "io/input-key-acceptor.h"
 #include "io/report.h"
 #include "io/write-diary.h"
@@ -118,7 +119,7 @@ static bool acid_minus_ac(player_type *creature_ptr)
     msg_format(_("%sが酸で腐食した!", "Your %s is corroded!"), o_name);
     o_ptr->to_a--;
     creature_ptr->update |= PU_BONUS;
-    creature_ptr->window |= PW_EQUIP | PW_PLAYER;
+    creature_ptr->window_flags |= PW_EQUIP | PW_PLAYER;
     calc_android_exp(creature_ptr);
     return TRUE;
 }
@@ -341,7 +342,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
     }
 
     creature_ptr->redraw |= PR_HP;
-    creature_ptr->window |= PW_PLAYER;
+    creature_ptr->window_flags |= PW_PLAYER;
 
     if (damage_type != DAMAGE_GENO && creature_ptr->chp == 0) {
         chg_virtue(creature_ptr, V_SACRIFICE, 1);
@@ -353,7 +354,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
 
 #ifdef JP
         /* 死んだ時に強制終了して死を回避できなくしてみた by Habu */
-        if (!cheat_save && !save_player(creature_ptr, SAVE_TYPE_NORMAL))
+        if (!cheat_save && !save_player(creature_ptr, SAVE_TYPE_CLOSE_GAME))
             msg_print("セーブ失敗!");
 #endif
 
@@ -445,7 +446,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
                     while (!get_string(winning_seppuku ? "辞世の句: " : "断末魔の叫び: ", death_message, sizeof(death_message)))
                         ;
 #else
-                    while (!get_string("Last word: ", death_message, 1024))
+                    while (!get_string("Last words: ", death_message, 1024))
                         ;
 #endif
                 } while (winning_seppuku && !get_check_strict(creature_ptr, _("よろしいですか?", "Are you sure? "), CHECK_NO_HISTORY));