呪文の巻物の効果がスナイパーにも一部付加されていた不具合を修正。

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

diff --git a/src/cmd6.c b/src/cmd6.c
index 059f0ea..c1aa2f7 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -520,6 +520,9 @@ msg_print("
                        floor_item_charges(0 - item);
                }
 
+               /* Window stuff */
+               p_ptr->window |= (PW_INVEN | PW_EQUIP);
+
                /* Don't eat a staff/wand itself */
                return;
        }
@@ -708,7 +711,7 @@ void do_cmd_eat_food(void)
 static void do_cmd_quaff_potion_aux(int item)
 {
        int         ident, lev;
-       object_type     *o_ptr;
+       object_type *o_ptr;
        object_type forge;
        object_type *q_ptr;
 
@@ -1437,7 +1440,7 @@ msg_print("
        /* Combine / Reorder the pack (later) */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       if (!(object_is_aware(o_ptr)))
+       if (!(object_is_aware(q_ptr)))
        {
                chg_virtue(V_PATIENCE, -1);
                chg_virtue(V_CHANCE, 1);
@@ -1464,7 +1467,7 @@ msg_print("
                switch (p_ptr->prace)
                {
                        case RACE_VAMPIRE:
-                               (void)set_food(p_ptr->food + (o_ptr->pval / 10));
+                               (void)set_food(p_ptr->food + (q_ptr->pval / 10));
                                break;
                        case RACE_SKELETON:
                                /* Do nothing */
@@ -1473,7 +1476,7 @@ msg_print("
                        case RACE_ZOMBIE:
                        case RACE_DEMON:
                        case RACE_SPECTRE:
-                               set_food(p_ptr->food + ((o_ptr->pval) / 20));
+                               set_food(p_ptr->food + ((q_ptr->pval) / 20));
                                break;
                        case RACE_ANDROID:
                                if (q_ptr->tval == TV_FLASK)
@@ -1487,7 +1490,7 @@ msg_print("
                                }
                                else
                                {
-                                       set_food(p_ptr->food + ((o_ptr->pval) / 20));
+                                       set_food(p_ptr->food + ((q_ptr->pval) / 20));
                                }
                                break;
                        case RACE_ENT:
@@ -1496,22 +1499,22 @@ msg_print("
 #else
                                msg_print("You are moistened.");
 #endif
-                               set_food(MIN(p_ptr->food + o_ptr->pval + MAX(0, o_ptr->pval * 10) + 2000, PY_FOOD_MAX - 1));
+                               set_food(MIN(p_ptr->food + q_ptr->pval + MAX(0, q_ptr->pval * 10) + 2000, PY_FOOD_MAX - 1));
                                break;
                        default:
-                               (void)set_food(p_ptr->food + o_ptr->pval);
+                               (void)set_food(p_ptr->food + q_ptr->pval);
                                break;
                }
                break;
        case MIMIC_DEMON:
        case MIMIC_DEMON_LORD:
-               set_food(p_ptr->food + ((o_ptr->pval) / 20));
+               set_food(p_ptr->food + ((q_ptr->pval) / 20));
                break;
        case MIMIC_VAMPIRE:
-               (void)set_food(p_ptr->food + (o_ptr->pval / 10));
+               (void)set_food(p_ptr->food + (q_ptr->pval / 10));
                break;
        default:
-               (void)set_food(p_ptr->food + o_ptr->pval);
+               (void)set_food(p_ptr->food + q_ptr->pval);
                break;
        }
 }
@@ -1977,7 +1980,21 @@ msg_print("
 
                case SV_SCROLL_SPELL:
                {
-                       if ((p_ptr->pclass == CLASS_WARRIOR) || (p_ptr->pclass == CLASS_IMITATOR) || (p_ptr->pclass == CLASS_MINDCRAFTER) || (p_ptr->pclass == CLASS_SORCERER) || (p_ptr->pclass == CLASS_ARCHER) || (p_ptr->pclass == CLASS_MAGIC_EATER) || (p_ptr->pclass == CLASS_RED_MAGE) || (p_ptr->pclass == CLASS_SAMURAI) || (p_ptr->pclass == CLASS_BLUE_MAGE) || (p_ptr->pclass == CLASS_CAVALRY) || (p_ptr->pclass == CLASS_BERSERKER) || (p_ptr->pclass == CLASS_SMITH) || (p_ptr->pclass == CLASS_MIRROR_MASTER) || (p_ptr->pclass == CLASS_NINJA)) break;
+                       if ((p_ptr->pclass == CLASS_WARRIOR) ||
+                               (p_ptr->pclass == CLASS_IMITATOR) ||
+                               (p_ptr->pclass == CLASS_MINDCRAFTER) ||
+                               (p_ptr->pclass == CLASS_SORCERER) ||
+                               (p_ptr->pclass == CLASS_ARCHER) ||
+                               (p_ptr->pclass == CLASS_MAGIC_EATER) ||
+                               (p_ptr->pclass == CLASS_RED_MAGE) ||
+                               (p_ptr->pclass == CLASS_SAMURAI) ||
+                               (p_ptr->pclass == CLASS_BLUE_MAGE) ||
+                               (p_ptr->pclass == CLASS_CAVALRY) ||
+                               (p_ptr->pclass == CLASS_BERSERKER) ||
+                               (p_ptr->pclass == CLASS_SMITH) ||
+                               (p_ptr->pclass == CLASS_MIRROR_MASTER) ||
+                               (p_ptr->pclass == CLASS_NINJA) ||
+                               (p_ptr->pclass == CLASS_SNIPER)) break;
                        p_ptr->add_spells++;
                        p_ptr->update |= (PU_SPELLS);
                        ident = TRUE;