For English spell descriptions, most only use one space after a period. Changed...

[hengbandforosx/hengbandosx.git] / src / bldg.c

diff --git a/src/bldg.c b/src/bldg.c
index 7c7f30d..2185bfc 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -14,9 +14,12 @@
 
 #include "angband.h"
 #include "floor.h"
+#include "object-boost.h"
 #include "object-hook.h"
+#include "monster.h"
 #include "monsterrace-hook.h"
 #include "melee.h"
+#include "wild.h"
 #include "world.h"
 #include "sort.h"
 
@@ -1445,6 +1448,7 @@ void battle_monsters(void)
                }
                for (i=0;i<4;i++)
                {
+                       if (power[i] <= 0) break;
                        power[i] = total*60/power[i];
                        if (tekitou && ((power[i] < 160) || power[i] > 1500)) break;
                        if ((power[i] < 160) && randint0(20)) break;
@@ -1461,12 +1465,12 @@ void battle_monsters(void)
  */
 static bool kakutoujou(void)
 {
-       s32b maxbet;
-       s32b wager;
+       PRICE maxbet;
+       PRICE wager;
        char out_val[160], tmp_str[80];
        concptr p;
 
-       if ((current_world_ptr->game_turn - old_battle) > TURNS_PER_TICK*250)
+       if ((current_world_ptr->game_turn - old_battle) > TURNS_PER_TICK * 250)
        {
                battle_monsters();
                old_battle = current_world_ptr->game_turn;
@@ -1520,9 +1524,9 @@ static bool kakutoujou(void)
                        else bell();
                }
 
-               clear_bldg(4,4);
-               for (i=0;i<4;i++)
-                       if (i !=sel_monster) clear_bldg(i+5,i+5);
+               clear_bldg(4, 4);
+               for (i = 0; i < 4; i++)
+                       if (i != sel_monster) clear_bldg(i + 5, i + 5);
 
                maxbet = p_ptr->lev * 200;
 
@@ -1637,9 +1641,9 @@ static void shoukinkubi(void)
        {
                byte color;
                concptr done_mark;
-               monster_race *r_ptr = &r_info[(kubi_r_idx[i] > 10000 ? kubi_r_idx[i] - 10000 : kubi_r_idx[i])];
+               monster_race *r_ptr = &r_info[(current_world_ptr->bounty_r_idx[i] > 10000 ? current_world_ptr->bounty_r_idx[i] - 10000 : current_world_ptr->bounty_r_idx[i])];
 
-               if (kubi_r_idx[i] > 10000)
+               if (current_world_ptr->bounty_r_idx[i] > 10000)
                {
                        color = TERM_RED;
                        done_mark = _("(済)", "(done)");
@@ -1829,7 +1833,7 @@ static bool kankin(void)
                for (i = INVEN_PACK-1; i >= 0; i--)
                {
                        o_ptr = &inventory[i];
-                       if ((o_ptr->tval == TV_CORPSE) && (o_ptr->pval == kubi_r_idx[j]))
+                       if ((o_ptr->tval == TV_CORPSE) && (o_ptr->pval == current_world_ptr->bounty_r_idx[j]))
                        {
                                char buf[MAX_NLEN+20];
                                int num, k;
@@ -1841,14 +1845,14 @@ static bool kankin(void)
                                if (!get_check(buf)) continue;
 
 #if 0 /* Obsoleted */
-                               msg_format(_("賞金 %ld＄を手に入れた。", "You get %ldgp."), (r_info[kubi_r_idx[j]].level + 1) * 300 * o_ptr->number);
-                               p_ptr->au += (r_info[kubi_r_idx[j]].level+1) * 300 * o_ptr->number;
+                               msg_format(_("賞金 %ld＄を手に入れた。", "You get %ldgp."), (r_info[current_world_ptr->bounty_r_idx[j]].level + 1) * 300 * o_ptr->number);
+                               p_ptr->au += (r_info[current_world_ptr->bounty_r_idx[j]].level+1) * 300 * o_ptr->number;
                                p_ptr->redraw |= (PR_GOLD);
                                inven_item_increase(i, -o_ptr->number);
                                inven_item_describe(i);
                                inven_item_optimize(i);
                                chg_virtue(V_JUSTICE, 5);
-                               kubi_r_idx[j] += 10000;
+                               current_world_ptr->bounty_r_idx[j] += 10000;
 
                                change = TRUE;
 #endif /* Obsoleted */
@@ -1859,12 +1863,12 @@ static bool kankin(void)
                                inven_item_optimize(i);
 
                                chg_virtue(V_JUSTICE, 5);
-                               kubi_r_idx[j] += 10000;
+                               current_world_ptr->bounty_r_idx[j] += 10000;
 
                                /* Count number of unique corpses already handed */
                                for (num = 0, k = 0; k < MAX_KUBI; k++)
                                {
-                                       if (kubi_r_idx[k] >= 10000) num++;
+                                       if (current_world_ptr->bounty_r_idx[k] >= 10000) num++;
                                }
                                msg_format(_("これで合計 %d ポイント獲得しました。" ,"You earned %d point%s total."), num, (num > 1 ? "s" : ""));
 
@@ -2152,7 +2156,11 @@ static void castle_quest(void)
 
                        q_ptr->cur_num = 0;
                        name = (r_name + r_ptr->name);
-                       msg_format(_("クエスト: %sを %d体倒す", "Your quest: kill %d %s"), name,q_ptr->max_num);
+#ifdef JP
+                       msg_format("クエスト: %sを %d体倒す", name, q_ptr->max_num);
+#else
+                       msg_format("Your quest: kill %d %s", q_ptr->max_num, name);
+#endif
                }
                else
                {
@@ -3141,7 +3149,7 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
                        one_ability(o_ptr);
                }
 
-               msg_print(_("これはかなりの業物だったようだ。", "This blade seems to be exceptionally."));
+               msg_print(_("これはかなりの業物だったようだ。", "This blade seems to be exceptional."));
        }
 
        object_desc(basenm, o_ptr, OD_NAME_ONLY);
@@ -3684,7 +3692,7 @@ bool tele_town(void)
                return FALSE;
        }
 
-       prt(_("どこに行きますか:", "Which town you go: "), 0, 0);
+       prt(_("どこに行きますか:", "Where do you want to go: "), 0, 0);
        while(1)
        {
                i = inkey();
@@ -3874,12 +3882,7 @@ static bool research_mon(void)
        /* Sort if needed */
        if (why)
        {
-               /* Select the sort method */
-               ang_sort_comp = ang_sort_comp_hook;
-               ang_sort_swap = ang_sort_swap_hook;
-
-               /* Sort the array */
-               ang_sort(who, &why, n);
+               ang_sort(who, &why, n, ang_sort_comp_hook, ang_sort_swap_hook);
        }