ｹｹｿｷ

[hengband/hengband.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index a9499cc..787c8cd 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -586,7 +586,7 @@ errr process_pref_file_command(char *buf)
                            option_info[i].o_text &&
                            streq(option_info[i].o_text, buf + 2))
                        {
-                               if (alive && 6 == option_info[i].o_page)
+                               if (alive && 6 == option_info[i].o_page && !wizard)
                                {
 #ifdef JP
                                        msg_format("½é´ü¥ª¥×¥·¥ç¥ó¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó! '%s'", buf);        
@@ -626,7 +626,7 @@ errr process_pref_file_command(char *buf)
                            option_info[i].o_text &&
                            streq(option_info[i].o_text, buf + 2))
                        {
-                               if (alive && 6 == option_info[i].o_page)
+                               if (alive && 6 == option_info[i].o_page && !wizard)
                                {
 #ifdef JP
                                        msg_format("½é´ü¥ª¥×¥·¥ç¥ó¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó! '%s'", buf);        
@@ -2197,7 +2197,7 @@ static void display_player_various(void)
                        if (object_known_p(o_ptr)) damage[i] += o_ptr->to_d*100;
                        basedam = (o_ptr->dd * (o_ptr->ds + 1))*50;
                        object_flags(o_ptr, &f1, &f2, &f3);
-                       if ((o_ptr->ident & IDENT_MENTAL) && (o_ptr->name1 == ART_VORPAL_BLADE))
+                       if ((o_ptr->ident & IDENT_MENTAL) && ((o_ptr->name1 == ART_VORPAL_BLADE) || (o_ptr->name1 == ART_CHAINSWORD)))
                        {
                                /* vorpal blade */
                                basedam *= 5;
@@ -5936,9 +5936,9 @@ void do_cmd_suicide(void)
        {
                /* Verify */
 #ifdef JP
-if (!get_check("°úÂष¤Þ¤¹¤«? ")) return;
+if (!get_check_strict("°úÂष¤Þ¤¹¤«? ", CHECK_NO_HISTORY)) return;
 #else
-               if (!get_check("Do you want to retire? ")) return;
+               if (!get_check_strict("Do you want to retire? ", CHECK_NO_HISTORY)) return;
 #endif
 
        }
@@ -6834,9 +6834,9 @@ if (!save_player()) msg_print("
                        if ((!send_world_score(do_send)))
                        {
 #ifdef JP
-                               if (get_check("¸å¤Ç¥¹¥³¥¢¤òÅÐÏ¿¤¹¤ë¤¿¤á¤ËÂÔµ¡¤·¤Þ¤¹¤«¡©"))
+                               if (get_check_strict("¸å¤Ç¥¹¥³¥¢¤òÅÐÏ¿¤¹¤ë¤¿¤á¤ËÂÔµ¡¤·¤Þ¤¹¤«¡©", (CHECK_NO_ESCAPE | CHECK_NO_HISTORY)))
 #else
-                               if (get_check("Stand by for later score registration? "))
+                               if (get_check_strict("Stand by for later score registration? ", (CHECK_NO_ESCAPE | CHECK_NO_HISTORY)))
 #endif
                                {
                                        wait_report_score = TRUE;