GF_ICE属性の攻撃に対し、目には目を等の反撃ダメージが発動しないバグを修正。

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

diff --git a/src/scores.c b/src/scores.c
index ae5e9a5..8b40f21 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -691,7 +691,7 @@ void show_highclass(void)
 {
 
        register int i = 0, j, m = 0;
-       int pr, pc, pa, clev/*, al*/;
+       int pr, clev/*, al*/;
        high_score the_score;
        char buf[1024], out_val[256];
 
@@ -728,8 +728,6 @@ msg_print("
                if (highscore_seek(j)) break;
                if (highscore_read(&the_score)) break;
                pr = atoi(the_score.p_r);
-               pc = atoi(the_score.p_c);
-               pa = atoi(the_score.p_a);
                clev = atoi(the_score.cur_lev);
 
 #ifdef JP
@@ -777,7 +775,7 @@ msg_print("
 void race_score(int race_num)
 {
        register int i = 0, j, m = 0;
-       int pr, pc, pa, clev, lastlev;
+       int pr, clev, lastlev;
        high_score the_score;
        char buf[1024], out_val[256], tmp_str[80];
 
@@ -824,8 +822,6 @@ msg_print("
                if (highscore_seek(j)) break;
                if (highscore_read(&the_score)) break;
                pr = atoi(the_score.p_r);
-               pc = atoi(the_score.p_c);
-               pa = atoi(the_score.p_a);
                clev = atoi(the_score.cur_lev);
 
                if (pr == race_num)
@@ -897,12 +893,13 @@ void kingly(void)
 {
        int wid, hgt;
        int cx, cy;
+       bool seppuku = streq(p_ptr->died_from, "Seppuku");
 
        /* Hack -- retire in town */
        dun_level = 0;
 
        /* Fake death */
-       if (!streq(p_ptr->died_from, "Seppuku"))
+       if (!seppuku)
 #ifdef JP
                /* °úÂष¤¿¤È¤­¤Î¼±ÊÌʸ»ú */
                (void)strcpy(p_ptr->died_from, "ripe");
@@ -952,14 +949,18 @@ void kingly(void)
        put_str(format("All Hail the Mighty %s!", sp_ptr->winner), cy + 5, cx - 13);
 #endif
 
+       /* If player did Seppuku, that is already written in playrecord */
+       if (!seppuku)
+       {
 #ifdef JP
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "¥À¥ó¥¸¥ç¥ó¤Îõº÷¤«¤é°úÂष¤¿¡£");
-       do_cmd_write_nikki(NIKKI_GAMESTART, 1, "-------- ¥²¡¼¥à¥ª¡¼¥Ð¡¼ --------");
+               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "¥À¥ó¥¸¥ç¥ó¤Îõº÷¤«¤é°úÂष¤¿¡£");
+               do_cmd_write_nikki(NIKKI_GAMESTART, 1, "-------- ¥²¡¼¥à¥ª¡¼¥Ð¡¼ --------");
 #else
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "retire exploring dungeons.");
-       do_cmd_write_nikki(NIKKI_GAMESTART, 1, "--------   Game  Over   --------");
+               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "retired exploring dungeons.");
+               do_cmd_write_nikki(NIKKI_GAMESTART, 1, "--------   Game  Over   --------");
 #endif
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 1, "\n\n\n\n");
+               do_cmd_write_nikki(NIKKI_BUNSHOU, 1, "\n\n\n\n");
+       }
 
        /* Flush input */
        flush();