./bootstrap 実行時に warning が出ないよう修正。

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

diff --git a/src/racial.c b/src/racial.c
index b172166..c0d3ded 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -134,6 +134,8 @@ static bool do_cmd_archer(void)
                }
                else
                {
+                       s16b slot;
+
                        /* Get local object */
                        q_ptr = &forge;
 
@@ -145,7 +147,7 @@ static bool do_cmd_archer(void)
                        apply_magic(q_ptr, p_ptr->lev, AM_NO_FIXED_ART);
                        q_ptr->discount = 99;
 
-                       (void)inven_carry(q_ptr);
+                       slot = inven_carry(q_ptr);
 
                        object_desc(o_name, q_ptr, 0);
 #ifdef JP
@@ -154,19 +156,21 @@ static bool do_cmd_archer(void)
                        msg_print("You make some ammo.");
 #endif
 
+                       /* Auto-inscription */
+                       if (slot >= 0) autopick_alter_item(slot, FALSE);
+
                        /* Destroy the wall */
                        cave_alter_feat(y, x, FF_HURT_ROCK);
 
-                       p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MONSTERS | PU_MON_LITE);
-                       p_ptr->window |= (PW_OVERHEAD);
+                       p_ptr->update |= (PU_FLOW);
                }
        }
        /**********Create arrows*********/
        else if (ext == 2)
        {
                int item;
-
                cptr q, s;
+               s16b slot;
 
                item_tester_hook = item_tester_hook_convertible;
 
@@ -190,7 +194,7 @@ static bool do_cmd_archer(void)
                else
                {
                        q_ptr = &o_list[0 - item];
-               }       
+               }
 
                /* Get local object */
                q_ptr = &forge;
@@ -223,14 +227,18 @@ static bool do_cmd_archer(void)
                        floor_item_describe(0 - item);
                        floor_item_optimize(0 - item);
                }
-               (void)inven_carry(q_ptr);
+
+               slot = inven_carry(q_ptr);
+
+               /* Auto-inscription */
+               if (slot >= 0) autopick_alter_item(slot, FALSE);
        }
        /**********Create bolts*********/
        else if (ext == 3)
        {
                int item;
-
                cptr q, s;
+               s16b slot;
 
                item_tester_hook = item_tester_hook_convertible;
 
@@ -288,7 +296,10 @@ static bool do_cmd_archer(void)
                        floor_item_optimize(0 - item);
                }
 
-               (void)inven_carry(q_ptr);
+               slot = inven_carry(q_ptr);
+
+               /* Auto-inscription */
+               if (slot >= 0) autopick_alter_item(slot, FALSE);
        }
        return TRUE;
 }
@@ -420,6 +431,41 @@ s = "
 }
 
 
+static bool can_do_cmd_cast(void)
+{
+       if (dun_level && (d_info[dungeon_type].flags1 & DF1_NO_MAGIC))
+       {
+#ifdef JP
+               msg_print("¥À¥ó¥¸¥ç¥ó¤¬ËâË¡¤òµÛ¼ý¤·¤¿¡ª");
+#else
+               msg_print("The dungeon absorbs all attempted magic!");
+#endif
+               msg_print(NULL);
+               return FALSE;
+       }
+       else if (p_ptr->anti_magic)
+       {
+#ifdef JP
+               msg_print("È¿ËâË¡¥Ð¥ê¥¢¤¬ËâË¡¤ò¼ÙË⤷¤¿¡ª");
+#else
+               msg_print("An anti-magic shell disrupts your magic!");
+#endif
+               return FALSE;
+       }
+       else if (p_ptr->shero)
+       {
+#ifdef JP
+               msg_format("¶¸Àï»Î²½¤·¤Æ¤¤¤ÆƬ¤¬²ó¤é¤Ê¤¤¡ª");
+#else
+               msg_format("You cannot think directly!");
+#endif
+               return FALSE;
+       }
+       else
+               return TRUE;
+}
+
+
 static bool choose_kamae(void)
 {
        char choice;
@@ -471,7 +517,7 @@ static bool choose_kamae(void)
                        screen_load();
                        return FALSE;
                }
-               else if ((choice == 'a') || (choice == 'A') || (choice == ESCAPE))
+               else if ((choice == 'a') || (choice == 'A'))
                {
                        if (p_ptr->action == ACTION_KAMAE)
                        {
@@ -609,7 +655,7 @@ static bool choose_kata(void)
                        screen_load();
                        return FALSE;
                }
-               else if ((choice == 'a') || (choice == 'A') || (choice == ESCAPE))
+               else if ((choice == 'a') || (choice == 'A'))
                {
                        if (p_ptr->action == ACTION_KATA)
                        {
@@ -836,6 +882,14 @@ static int racial_aux(power_desc_type *pd_ptr)
 }
 
 
+
+void ratial_stop_mouth()
+{
+       if (music_singing_any()) stop_singing();
+       if (hex_spelling_any()) stop_hex_spell_all();
+}
+
+
 static bool cmd_racial_power_aux(s32b command)
 {
        s16b        plev = p_ptr->lev;
@@ -871,8 +925,15 @@ static bool cmd_racial_power_aux(s32b command)
                        }
                        break;
                }
-               case CLASS_MAGE:
                case CLASS_HIGH_MAGE:
+               if (p_ptr->realm1 == REALM_HEX)
+               {
+                       bool retval = stop_hex_spell();
+                       if (retval) energy_use = 10;
+                       return (retval);
+               }
+               case CLASS_MAGE:
+               /* case CLASS_HIGH_MAGE: */
                case CLASS_SORCERER:
                {
                        if (!eat_magic(p_ptr->lev * 2)) return FALSE;
@@ -908,7 +969,7 @@ static bool cmd_racial_power_aux(s32b command)
 #else
                                        msg_print("You are failed to run away.");
 #endif
-                               else teleport_player(30, FALSE);
+                               else teleport_player(30, 0L);
                        }
                        else
                        {
@@ -923,6 +984,7 @@ static bool cmd_racial_power_aux(s32b command)
                        break;
                }
                case CLASS_RANGER:
+               case CLASS_SNIPER:
                {
 #ifdef JP
                        msg_print("Ũ¤òÄ´ºº¤·¤¿...");
@@ -1010,13 +1072,20 @@ static bool cmd_racial_power_aux(s32b command)
 #endif
                                return FALSE;
                        }
+                       if (p_ptr->riding)
+                       {
+#ifdef JP
+                               msg_print("¾èÇÏÃæ¤Ï¤Ç¤­¤Þ¤»¤ó¡£");
+#else
+                               msg_print("You need to get off a pet.");
+#endif
+                               return FALSE;
+                       }
 
                        if (command == -3)
                        {
-                               if (choose_kamae()) energy_use = 100;
-                               else energy_use = 0;
+                               if (!choose_kamae()) return FALSE;
                                p_ptr->update |= (PU_BONUS);
-                               p_ptr->redraw |= (PR_ARMOR);
                        }
                        else if (command == -4)
                        {
@@ -1139,10 +1208,11 @@ static bool cmd_racial_power_aux(s32b command)
                }
                case CLASS_RED_MAGE:
                {
+                       if (!can_do_cmd_cast()) return FALSE;
                        handle_stuff();
                        do_cmd_cast();
                        handle_stuff();
-                       if (!p_ptr->paralyzed)
+                       if (!p_ptr->paralyzed && can_do_cmd_cast())
                                do_cmd_cast();
                        break;
                }
@@ -1197,10 +1267,8 @@ static bool cmd_racial_power_aux(s32b command)
 #endif
                                        return FALSE;
                                }
-                               if (choose_kata()) energy_use = 100;
-                               else energy_use = 0;
+                               if (!choose_kata()) return FALSE;
                                p_ptr->update |= (PU_BONUS);
-                               p_ptr->redraw |= (PR_ARMOR);
                        }
                        break;
                }
@@ -1355,6 +1423,7 @@ static bool cmd_racial_power_aux(s32b command)
                {
                        int type = (one_in_(2) ? GF_NETHER : GF_FIRE);
                        if (!get_aim_dir(&dir)) return FALSE;
+                       ratial_stop_mouth();
 #ifdef JP
                        msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",((type == GF_NETHER) ? "ÃϹö" : "²Ð±ê"));
 #else
@@ -1385,6 +1454,8 @@ static bool cmd_racial_power_aux(s32b command)
                                x = px + ddx[dir];
                                c_ptr = &cave[y][x];
 
+                               ratial_stop_mouth();
+
                                if (!c_ptr->m_idx)
                                {
 #ifdef JP
@@ -1481,7 +1552,7 @@ static bool cmd_racial_power_aux(s32b command)
                        msg_print("Blink!");
 #endif
 
-                       teleport_player(10, FALSE);
+                       teleport_player(10, 0L);
                        break;
 
                case RACE_HALF_ORC:
@@ -1590,6 +1661,7 @@ static bool cmd_racial_power_aux(s32b command)
 
                case RACE_YEEK:
                        if (!get_aim_dir(&dir)) return FALSE;
+                       ratial_stop_mouth();
 #ifdef JP
                        msg_print("¿È¤ÎÌÓ¤â¤è¤À¤Ä¶«¤ÓÀ¼¤ò¾å¤²¤¿¡ª");
 #else
@@ -1601,6 +1673,7 @@ static bool cmd_racial_power_aux(s32b command)
 
                case RACE_KLACKON:
                        if (!get_aim_dir(&dir)) return FALSE;
+                       ratial_stop_mouth();
 #ifdef JP
                        msg_print("»À¤òÅǤ¤¤¿¡£");
 #else
@@ -1841,6 +1914,8 @@ static bool cmd_racial_power_aux(s32b command)
                                        }
                                }
 
+                               ratial_stop_mouth();
+
 #ifdef JP
                                msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", Type_desc);
 #else
@@ -1923,6 +1998,8 @@ static bool cmd_racial_power_aux(s32b command)
                                x = px + ddx[dir];
                                c_ptr = &cave[y][x];
 
+                               ratial_stop_mouth();
+
                                if (!c_ptr->m_idx)
                                {
 #ifdef JP
@@ -1973,6 +2050,7 @@ static bool cmd_racial_power_aux(s32b command)
 
                case RACE_SPECTRE:
                        if (!get_aim_dir(&dir)) return FALSE;
+                       ratial_stop_mouth();
 #ifdef JP
                        msg_print("¤¢¤Ê¤¿¤Ï¤ª¤É¤í¤ª¤É¤í¤·¤¤¶«¤ÓÀ¼¤ò¤¢¤²¤¿¡ª");
 #else
@@ -1997,6 +2075,7 @@ static bool cmd_racial_power_aux(s32b command)
                        {
                                int type = (one_in_(2) ? GF_NETHER : GF_FIRE);
                                if (!get_aim_dir(&dir)) return FALSE;
+                               ratial_stop_mouth();
 #ifdef JP
                                msg_format("¤¢¤Ê¤¿¤Ï%s¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£",((type == GF_NETHER) ? "ÃϹö" : "²Ð±ê"));
 #else
@@ -2007,7 +2086,7 @@ static bool cmd_racial_power_aux(s32b command)
                        }
                        break;
 
-               case RACE_KUTA:
+               case RACE_KUTAR:
                        (void)set_tsubureru(randint1(20) + 30, FALSE);
                        break;
 
@@ -2056,7 +2135,7 @@ static bool cmd_racial_power_aux(s32b command)
 #else
                                msg_print("You fire a rocket.");
 #endif
-                               fire_ball(GF_ROCKET, dir, plev * 5, 2);
+                               fire_rocket(GF_ROCKET, dir, plev * 5, 2);
                        }
                        break;
 
@@ -2132,8 +2211,23 @@ strcpy(power_desc[num].name, "
                power_desc[num++].number = -3;
                break;
        }
-       case CLASS_MAGE:
        case CLASS_HIGH_MAGE:
+       if (p_ptr->realm1 == REALM_HEX)
+       {
+#ifdef JP
+               strcpy(power_desc[num].name, "±Ó¾§¤ò¤ä¤á¤ë");
+#else
+               strcpy(power_desc[num].name, "Stop spelling");
+#endif
+               power_desc[num].level = 1;
+               power_desc[num].cost = 0;
+               power_desc[num].stat = A_INT;
+               power_desc[num].fail = 0;
+               power_desc[num++].number = -3;
+               break;
+       }
+       case CLASS_MAGE:
+       /* case CLASS_HIGH_MAGE: */
        case CLASS_SORCERER:
        {
 #ifdef JP
@@ -2197,6 +2291,7 @@ strcpy(power_desc[num].name, "
                break;
        }
        case CLASS_RANGER:
+       case CLASS_SNIPER:
        {
 #ifdef JP
 strcpy(power_desc[num].name, "¥â¥ó¥¹¥¿¡¼Ä´ºº");
@@ -2963,7 +3058,7 @@ sprintf(power_desc[num].name, "
                        power_desc[num].fail = 20;
                        power_desc[num++].number = -1;
                        break;
-               case RACE_KUTA:
+               case RACE_KUTAR:
 #ifdef JP
 strcpy(power_desc[num].name, "²£¤Ë¿­¤Ó¤ë");
 #else