ゲームターンがオーバーフローするバグを修正. このバグ修正に伴い, 以下

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

diff --git a/src/store.c b/src/store.c
index 3f81302..11d76df 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -2605,7 +2605,7 @@ static int get_haggle(cptr pmt, s32b *poffer, s32b price, int final)
                 * Ask the user for a response.
                 * Don't allow to use numpad as cursor key.
                 */
-               res = askfor_aux(out_val, 32, FALSE, FALSE);
+               res = askfor_aux(out_val, 32, FALSE);
 
                /* Clear prompt */
                prt("", 0, 0);
@@ -4098,7 +4098,7 @@ msg_format("%s
 
 
        /* Describe it fully */
-       if (!screen_object(o_ptr, TRUE))
+       if (!screen_object(o_ptr, SCROBJ_FORCE_DETAIL))
 #ifdef JP
 msg_print("ÆäËÊѤï¤Ã¤¿¤È¤³¤í¤Ï¤Ê¤¤¤è¤¦¤À¡£");
 #else
@@ -4386,7 +4386,16 @@ static void store_process_command(void)
                /* Browse a book */
                case 'b':
                {
-                       do_cmd_browse();
+                       if ( (p_ptr->pclass == CLASS_MINDCRAFTER) ||
+                            (p_ptr->pclass == CLASS_BERSERKER) ||
+                            (p_ptr->pclass == CLASS_NINJA) ||
+                            (p_ptr->pclass == CLASS_MIRROR_MASTER) 
+                            ) do_cmd_mind_browse();
+                       else if (p_ptr->pclass == CLASS_SMITH)
+                               do_cmd_kaji(TRUE);
+                       else if (p_ptr->pclass == CLASS_MAGIC_EATER)
+                               do_cmd_magic_eater(TRUE);
+                       else do_cmd_browse();
                        break;
                }
 
@@ -4606,7 +4615,7 @@ void do_cmd_store(void)
        }
 
        /* Extract the store code */
-       which = f_info[c_ptr->feat].power;
+       which = f_info[c_ptr->feat].subtype;
 
        old_town_num = p_ptr->town_num;
        if ((which == STORE_HOME) || (which == STORE_MUSEUM)) p_ptr->town_num = 1;