Target quest infomations are not initialized when getting quest name from q_info...

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

diff --git a/src/files.c b/src/files.c
index 954f8d6..ee1c47c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -822,7 +822,7 @@ cptr process_pref_file_expr(char **sp, char *fp)
        char b2 = ']';
 
        char f = ' ';
-       static char tmp[8];
+       static char tmp[10];
 
        /* Initial */
        s = (*sp);
@@ -1074,6 +1074,13 @@ cptr process_pref_file_expr(char **sp, char *fp)
                                else
                                        v = "0";
                        }
+
+                       /* Money */
+                       else if (streq(b+1, "MONEY"))
+                       {
+                               sprintf(tmp, "%09ld", (long int)p_ptr->au);
+                               v = tmp;
+                       }
                }
 
                /* Constant */
@@ -2547,7 +2554,7 @@ static void player_flags(u32b flgs[TR_FLAG_SIZE])
        case RACE_S_FAIRY:
                add_flag(flgs, TR_LEVITATION);
                break;
-       case RACE_KUTA:
+       case RACE_KUTAR:
                add_flag(flgs, TR_RES_CONF);
                break;
        case RACE_ANDROID:
@@ -2779,6 +2786,18 @@ static void tim_player_flags(u32b flgs[TR_FLAG_SIZE])
                add_flag(flgs, TR_SUST_CON);
                add_flag(flgs, TR_SUST_CHR);
        }
+
+       /* Hex bonuses */
+       if (p_ptr->realm1 == REALM_HEX)
+       {
+               if (hex_spelling(HEX_DEMON_AURA))
+               {
+                       add_flag(flgs, TR_SH_FIRE);
+                       add_flag(flgs, TR_REGEN);
+               }
+               if (hex_spelling(HEX_ICE_ARMOR)) add_flag(flgs, TR_SH_COLD);
+               if (hex_spelling(HEX_SHOCK_CLOAK)) add_flag(flgs, TR_SH_ELEC);
+       }
 }
 
 
@@ -3245,49 +3264,49 @@ static void display_player_other_flag_info(void)
        row = 3;
        col = col + 12 + 7;
 
-       display_player_equippy(row-2, col+12, 0);
-       c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+12);
-
-#ifdef JP
-       display_flag_aux(row+ 0, col, "¥Æ¥ì¥Ñ¥·¡¼:", TR_TELEPATHY, &f, 0);
-       display_flag_aux(row+ 1, col, "¼Ù°­ESP   :", TR_ESP_EVIL, &f, 0);
-       display_flag_aux(row+ 2, col, "̵À¸ÊªESP :", TR_ESP_NONLIVING, &f, 0);
-       display_flag_aux(row+ 3, col, "Á±ÎÉESP   :", TR_ESP_GOOD, &f, 0);
-       display_flag_aux(row+ 4, col, "ÉÔ»àESP   :", TR_ESP_UNDEAD, &f, 0);
-       display_flag_aux(row+ 5, col, "°­ËâESP   :", TR_ESP_DEMON, &f, 0);
-       display_flag_aux(row+ 6, col, "ζESP     :", TR_ESP_DRAGON, &f, 0);
-       display_flag_aux(row+ 7, col, "¿Í´ÖESP   :", TR_ESP_HUMAN, &f, 0);
-       display_flag_aux(row+ 8, col, "ưʪESP   :", TR_ESP_ANIMAL, &f, 0);
-       display_flag_aux(row+ 9, col, "¥ª¡¼¥¯ESP :", TR_ESP_ORC, &f, 0);
-       display_flag_aux(row+10, col, "¥È¥í¥ëESP :", TR_ESP_TROLL, &f, 0);
-       display_flag_aux(row+11, col, "µð¿ÍESP   :", TR_ESP_GIANT, &f, 0);
-
-       display_flag_aux(row+13, col, "ÏÓÎÏ°Ý»ý  :", TR_SUST_STR, &f, 0);
-       display_flag_aux(row+14, col, "ÃÎÎÏ°Ý»ý  :", TR_SUST_INT, &f, 0);
-       display_flag_aux(row+15, col, "¸­¤µ°Ý»ý  :", TR_SUST_WIS, &f, 0);
-       display_flag_aux(row+16, col, "´ïÍÑ°Ý»ý  :", TR_SUST_DEX, &f, 0);
-       display_flag_aux(row+17, col, "Âѵװݻý  :", TR_SUST_CON, &f, 0);
-       display_flag_aux(row+18, col, "Ì¥ÎÏ°Ý»ý  :", TR_SUST_CHR, &f, 0);
-#else
-       display_flag_aux(row+ 0, col, "Telepathy :", TR_TELEPATHY, &f, 0);
-       display_flag_aux(row+ 1, col, "ESP Evil  :", TR_ESP_EVIL, &f, 0);
-       display_flag_aux(row+ 2, col, "ESP Noliv.:", TR_ESP_NONLIVING, &f, 0);
-       display_flag_aux(row+ 3, col, "ESP Good  :", TR_ESP_GOOD, &f, 0);
-       display_flag_aux(row+ 4, col, "ESP Undead:", TR_ESP_UNDEAD, &f, 0);
-       display_flag_aux(row+ 5, col, "ESP Demon :", TR_ESP_DEMON, &f, 0);
-       display_flag_aux(row+ 6, col, "ESP Dragon:", TR_ESP_DRAGON, &f, 0);
-       display_flag_aux(row+ 7, col, "ESP Human :", TR_ESP_HUMAN, &f, 0);
-       display_flag_aux(row+ 8, col, "ESP Animal:", TR_ESP_ANIMAL, &f, 0);
-       display_flag_aux(row+ 9, col, "ESP Orc   :", TR_ESP_ORC, &f, 0);
-       display_flag_aux(row+10, col, "ESP Troll :", TR_ESP_TROLL, &f, 0);
-       display_flag_aux(row+11, col, "ESP Giant :", TR_ESP_GIANT, &f, 0);
-
-       display_flag_aux(row+13, col, "Sust Str  :", TR_SUST_STR, &f, 0);
-       display_flag_aux(row+14, col, "Sust Int  :", TR_SUST_INT, &f, 0);
-       display_flag_aux(row+15, col, "Sust Wis  :", TR_SUST_WIS, &f, 0);
-       display_flag_aux(row+16, col, "Sust Dex  :", TR_SUST_DEX, &f, 0);
-       display_flag_aux(row+17, col, "Sust Con  :", TR_SUST_CON, &f, 0);
-       display_flag_aux(row+18, col, "Sust Chr  :", TR_SUST_CHR, &f, 0);
+       display_player_equippy(row-2, col+13, 0);
+       c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+13);
+
+#ifdef JP
+       display_flag_aux(row+ 0, col, "¥Æ¥ì¥Ñ¥·¡¼ :", TR_TELEPATHY, &f, 0);
+       display_flag_aux(row+ 1, col, "¼Ù°­ESP    :", TR_ESP_EVIL, &f, 0);
+       display_flag_aux(row+ 2, col, "̵À¸ÊªESP  :", TR_ESP_NONLIVING, &f, 0);
+       display_flag_aux(row+ 3, col, "Á±ÎÉESP    :", TR_ESP_GOOD, &f, 0);
+       display_flag_aux(row+ 4, col, "ÉÔ»àESP    :", TR_ESP_UNDEAD, &f, 0);
+       display_flag_aux(row+ 5, col, "°­ËâESP    :", TR_ESP_DEMON, &f, 0);
+       display_flag_aux(row+ 6, col, "ζESP      :", TR_ESP_DRAGON, &f, 0);
+       display_flag_aux(row+ 7, col, "¿Í´ÖESP    :", TR_ESP_HUMAN, &f, 0);
+       display_flag_aux(row+ 8, col, "ưʪESP    :", TR_ESP_ANIMAL, &f, 0);
+       display_flag_aux(row+ 9, col, "¥ª¡¼¥¯ESP  :", TR_ESP_ORC, &f, 0);
+       display_flag_aux(row+10, col, "¥È¥í¥ëESP  :", TR_ESP_TROLL, &f, 0);
+       display_flag_aux(row+11, col, "µð¿ÍESP    :", TR_ESP_GIANT, &f, 0);
+       display_flag_aux(row+12, col, "¥æ¥Ë¡¼¥¯ESP:", TR_ESP_UNIQUE, &f, 0);
+       display_flag_aux(row+13, col, "ÏÓÎÏ°Ý»ý   :", TR_SUST_STR, &f, 0);
+       display_flag_aux(row+14, col, "ÃÎÎÏ°Ý»ý   :", TR_SUST_INT, &f, 0);
+       display_flag_aux(row+15, col, "¸­¤µ°Ý»ý   :", TR_SUST_WIS, &f, 0);
+       display_flag_aux(row+16, col, "´ïÍÑ°Ý»ý   :", TR_SUST_DEX, &f, 0);
+       display_flag_aux(row+17, col, "Âѵװݻý   :", TR_SUST_CON, &f, 0);
+       display_flag_aux(row+18, col, "Ì¥ÎÏ°Ý»ý   :", TR_SUST_CHR, &f, 0);
+#else
+       display_flag_aux(row+ 0, col, "Telepathy  :", TR_TELEPATHY, &f, 0);
+       display_flag_aux(row+ 1, col, "ESP Evil   :", TR_ESP_EVIL, &f, 0);
+       display_flag_aux(row+ 2, col, "ESP Noliv. :", TR_ESP_NONLIVING, &f, 0);
+       display_flag_aux(row+ 3, col, "ESP Good   :", TR_ESP_GOOD, &f, 0);
+       display_flag_aux(row+ 4, col, "ESP Undead :", TR_ESP_UNDEAD, &f, 0);
+       display_flag_aux(row+ 5, col, "ESP Demon  :", TR_ESP_DEMON, &f, 0);
+       display_flag_aux(row+ 6, col, "ESP Dragon :", TR_ESP_DRAGON, &f, 0);
+       display_flag_aux(row+ 7, col, "ESP Human  :", TR_ESP_HUMAN, &f, 0);
+       display_flag_aux(row+ 8, col, "ESP Animal :", TR_ESP_ANIMAL, &f, 0);
+       display_flag_aux(row+ 9, col, "ESP Orc    :", TR_ESP_ORC, &f, 0);
+       display_flag_aux(row+10, col, "ESP Troll  :", TR_ESP_TROLL, &f, 0);
+       display_flag_aux(row+11, col, "ESP Giant  :", TR_ESP_GIANT, &f, 0);
+       display_flag_aux(row+12, col, "ESP Unique :", TR_ESP_UNIQUE, &f, 0);
+       display_flag_aux(row+13, col, "Sust Str   :", TR_SUST_STR, &f, 0);
+       display_flag_aux(row+14, col, "Sust Int   :", TR_SUST_INT, &f, 0);
+       display_flag_aux(row+15, col, "Sust Wis   :", TR_SUST_WIS, &f, 0);
+       display_flag_aux(row+16, col, "Sust Dex   :", TR_SUST_DEX, &f, 0);
+       display_flag_aux(row+17, col, "Sust Con   :", TR_SUST_CON, &f, 0);
+       display_flag_aux(row+18, col, "Sust Chr   :", TR_SUST_CHR, &f, 0);
 #endif
 
 
@@ -3868,7 +3887,7 @@ void display_player(int mode)
                                {
                                        /* Get the quest text */
                                        /* Bewere that INIT_ASSIGN resets the cur_num. */
-                                       init_flags = INIT_ASSIGN;
+                                       init_flags = INIT_NAME_ONLY;
 
                                        process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
@@ -3908,7 +3927,7 @@ void display_player(int mode)
                                        quest_text_line = 0;
 
                                        /* Get the quest text */
-                                       init_flags = INIT_SHOW_TEXT;
+                                       init_flags = INIT_NAME_ONLY;
 
                                        process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
@@ -4108,11 +4127,7 @@ static void dump_aux_display_player(FILE *fff)
                fprintf(fff, "%s\n", buf);
        }
 
-       for (i = 0; (unsigned int) i < (p_ptr->count / 80); i++)
-               fprintf(fff, " ");
        fprintf(fff, "\n");
-       for (i = 0; (unsigned int) i < (p_ptr->count % 80); i++)
-               fprintf(fff, " ");
 }
 
 
@@ -4331,7 +4346,88 @@ static void dump_aux_class_special(FILE *fff)
 
                for (i=0;i<=col;i++)
                {
-                       fprintf(fff, p[i]);
+                       fputs(p[i], fff);
+               }
+       }
+       else if (p_ptr->pclass == CLASS_MAGIC_EATER)
+       {
+               char s[EATER_EXT][MAX_NLEN];
+               int tval, ext, k_idx;
+               int i, magic_num;
+
+#ifdef JP
+               fprintf(fff, "\n\n  [¼è¤ê¹þ¤ó¤ÀËâË¡Æ»¶ñ]\n");
+#else
+               fprintf(fff, "\n\n  [Magic devices eaten]\n");
+#endif
+
+               for (ext = 0; ext < 3; ext++)
+               {
+                       int eat_num = 0;
+
+                       /* Dump an extent name */
+                       switch (ext)
+                       {
+                       case 0:
+                               tval = TV_STAFF;
+#ifdef JP
+                               fprintf(fff, "\n[¾ó]\n");
+#else
+                               fprintf(fff, "\n[Staffs]\n");
+#endif
+                               break;
+                       case 1:
+                               tval = TV_WAND;
+#ifdef JP
+                               fprintf(fff, "\n[ËâË¡ËÀ]\n");
+#else
+                               fprintf(fff, "\n[Wands]\n");
+#endif
+                               break;
+                       case 2:
+                               tval = TV_ROD;
+#ifdef JP
+                               fprintf(fff, "\n[¥í¥Ã¥É]\n");
+#else
+                               fprintf(fff, "\n[Rods]\n");
+#endif
+                               break;
+                       }
+
+                       /* Get magic device names that were eaten */
+                       for (i = 0; i < EATER_EXT; i++)
+                       {
+                               int idx = EATER_EXT * ext + i;
+
+                               magic_num = p_ptr->magic_num2[idx];
+                               if (!magic_num) continue;
+
+                               k_idx = lookup_kind(tval, i);
+                               if (!k_idx) continue;
+                               sprintf(s[eat_num], "%23s (%2d)", (k_name + k_info[k_idx].name), magic_num);
+                               eat_num++;
+                       }
+
+                       /* Dump magic devices in this extent */
+                       if (eat_num > 0)
+                       {
+                               for (i = 0; i < eat_num; i++)
+                               {
+                                       fputs(s[i], fff);
+                                       if (i % 3 < 2) fputs("    ", fff);
+                                       else fputs("\n", fff);
+                               }
+
+                               if (i % 3 > 0) fputs("\n", fff);
+                       }
+                       else /* Not found */
+                       {
+#ifdef JP
+                               fputs("  (¤Ê¤·)\n", fff);
+#else
+                               fputs("  (none)\n", fff);
+#endif
+                       }
                }
        }
 }