bow of accuracy have now higher to_h than to_d.

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

diff --git a/src/cmd3.c b/src/cmd3.c
index cf25c74..721d4a0 100644 (file)
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -46,8 +46,8 @@ void do_cmd_inven(void)
 
 #ifdef JP
        sprintf(out_val, "»ý¤Áʪ¡§ ¹ç·× %3d.%1d kg (¸Â³¦¤Î%ld%%) ¥³¥Þ¥ó¥É: ",
-           lbtokg1(p_ptr->total_weight) , lbtokg2(p_ptr->total_weight) ,
-           (p_ptr->total_weight * 100) / weight_limit());
+           (int)lbtokg1(p_ptr->total_weight) , (int)lbtokg2(p_ptr->total_weight) ,
+           (long int)((p_ptr->total_weight * 100) / weight_limit()));
 #else
        sprintf(out_val, "Inventory: carrying %d.%d pounds (%ld%% of capacity). Command: ",
            (int)(p_ptr->total_weight / 10), (int)(p_ptr->total_weight % 10),
@@ -120,12 +120,12 @@ void do_cmd_equip(void)
        /* Build a prompt */
 #ifdef JP
        sprintf(out_val, "ÁõÈ÷¡§ ¹ç·× %3d.%1d kg (¸Â³¦¤Î%ld%%) ¥³¥Þ¥ó¥É: ",
-           lbtokg1(p_ptr->total_weight) , lbtokg2(p_ptr->total_weight) ,
-           (p_ptr->total_weight * 100) / weight_limit());
+           (int)lbtokg1(p_ptr->total_weight) , (int)lbtokg2(p_ptr->total_weight) ,
+           (long int)((p_ptr->total_weight * 100) / weight_limit()));
 #else
        sprintf(out_val, "Equipment: carrying %d.%d pounds (%ld%% of capacity). Command: ",
            (int)(p_ptr->total_weight / 10), (int)(p_ptr->total_weight % 10),
-           (p_ptr->total_weight * 100) / weight_limit());
+           (long int)((p_ptr->total_weight * 100) / weight_limit()));
 #endif
 
 
@@ -206,7 +206,7 @@ bool select_ring_slot = FALSE;
  */
 void do_cmd_wield(void)
 {
-       int i, item, slot;
+       int item, slot;
 
        object_type forge;
        object_type *q_ptr;
@@ -465,25 +465,7 @@ sprintf(dummy, "%s
                slot = need_switch_wielding;
        }
 
-       /* Check if completed a quest */
-       for (i = 0; i < max_quests; i++)
-       {
-               if ((quest[i].type == QUEST_TYPE_FIND_ARTIFACT) &&
-                   (quest[i].status == QUEST_STATUS_TAKEN) &&
-                   (quest[i].k_idx == o_ptr->name1))
-               {
-                       if (record_fix_quest) do_cmd_write_nikki(NIKKI_FIX_QUEST_C, i, NULL);
-                       quest[i].status = QUEST_STATUS_COMPLETED;
-                       quest[i].complev = (byte)p_ptr->lev;
-#ifdef JP
-msg_print("¥¯¥¨¥¹¥È¤òãÀ®¤·¤¿¡ª");
-#else
-                       msg_print("You completed the quest!");
-#endif
-
-                       msg_print(NULL);
-               }
-       }
+       check_find_art_quest_completion(o_ptr);
 
        if (p_ptr->pseikaku == SEIKAKU_MUNCHKIN)
        {
@@ -922,7 +904,8 @@ static bool high_level_book(object_type *o_ptr)
            (o_ptr->tval == TV_CRAFT_BOOK) ||
            (o_ptr->tval == TV_DAEMON_BOOK) ||
            (o_ptr->tval == TV_CRUSADE_BOOK) ||
-           (o_ptr->tval == TV_MUSIC_BOOK))
+           (o_ptr->tval == TV_MUSIC_BOOK) ||
+               (o_ptr->tval == TV_HEX_BOOK))
        {
                if (o_ptr->sval > 1)
                        return TRUE;
@@ -1748,6 +1731,11 @@ void do_cmd_target(void)
  */
 void do_cmd_look(void)
 {
+       /*TEST*/
+       p_ptr->window |= PW_MONSTER_LIST;
+       window_stuff();
+       /*TEST*/
+
        /* Look around */
        if (target_set(TARGET_LOOK))
        {