GF_INERTIA が Windows7 Multitouch API のために単語重複する問題を "GF_INERTIAL" として一時的に解決。 / Solve...

diff --git a/src/defines.h b/src/defines.h
index f3f5b2c..4bf935c 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2975,7 +2975,7 @@
 #define GF_SOUND        21
 #define GF_CONFUSION    22
 #define GF_FORCE        23
-#define GF_INERTIA      24
+#define GF_INERTIAL      24
 #define GF_MANA         26
 #define GF_METEOR       27
 #define GF_ICE          28

diff --git a/src/files.c b/src/files.c
index f1aa05f..10c2a34 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -215,7 +215,7 @@ static named_num gf_desc[] =
        {"GF_SOUND",                            GF_SOUND                                },
        {"GF_CONFUSION",                        GF_CONFUSION            },
        {"GF_FORCE",                            GF_FORCE                                },
-       {"GF_INERTIA",                          GF_INERTIA                      },
+       {"GF_INERTIA",                          GF_INERTIAL                     },
        {"GF_MANA",                                     GF_MANA                         },
        {"GF_METEOR",                           GF_METEOR                       },
        {"GF_ICE",                                      GF_ICE                          },

diff --git a/src/mane.c b/src/mane.c
index 843de44..e79196a 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -411,7 +411,7 @@ static bool use_mane(int spell)
                if (!get_aim_dir(&dir)) return FALSE;
                else msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
                
-                       fire_ball(GF_INERTIA, dir, damage, (plev > 35 ? -3 : -2));
+                       fire_ball(GF_INERTIAL, dir, damage, (plev > 35 ? -3 : -2));
                break;
        case MS_BR_GRAVITY:
                if (!get_aim_dir(&dir)) return FALSE;

diff --git a/src/melee2.c b/src/melee2.c
index 4c56991..d9a7e00 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -1846,7 +1846,7 @@ static bool monst_attack_monst(int m_idx, int t_idx)
                                break;
 
                        case RBE_INERTIA:
-                               pt = GF_INERTIA;
+                               pt = GF_INERTIAL;
                                break;
 
                        case RBE_STUN:

diff --git a/src/mspells3.c b/src/mspells3.c
index 96ac753..49a2a37 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -772,7 +772,7 @@ static bool cast_learned_spell(int spell, bool success)
 
         msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia."));
         damage = monspell_bluemage_damage((MS_BR_INERTIA), plev, DAM_ROLL);
-               fire_ball(GF_INERTIA, dir, damage, (plev > 40 ? -3 : -2));
+               fire_ball(GF_INERTIAL, dir, damage, (plev > 40 ? -3 : -2));
                break;
        case MS_BR_GRAVITY:
                if (!get_aim_dir(&dir)) return FALSE;

diff --git a/src/mspells4.c b/src/mspells4.c
index 5ea013a..d9ba18a 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -401,7 +401,7 @@ int spell_RF4_BREATH(int GF_TYPE, int y, int x, int m_idx, int t_idx, int TARGET
         ms_type = MS_BR_TIME;
         smart_learn = FALSE;
         break;
-    case GF_INERTIA:
+    case GF_INERTIAL:
         dam = monspell_damage((MS_BR_INERTIA), m_idx, DAM_ROLL);
         type_s = _("遅鈍", "inertia");
         ms_type = MS_BR_INERTIA;
@@ -3441,7 +3441,7 @@ int monspell_to_player(int SPELL_NUM, int y, int x, int m_idx)
     case RF4_SPELL_START + 19:  return spell_RF4_BREATH(GF_DISENCHANT, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_DISE */
     case RF4_SPELL_START + 20:  return spell_RF4_BREATH(GF_NEXUS, y, x, m_idx, 0, MONSTER_TO_PLAYER);    /* RF4_BR_NEXU */
     case RF4_SPELL_START + 21:  return spell_RF4_BREATH(GF_TIME, y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_BR_TIME */
-    case RF4_SPELL_START + 22:  return spell_RF4_BREATH(GF_INERTIA, y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF4_BR_INER */
+    case RF4_SPELL_START + 22:  return spell_RF4_BREATH(GF_INERTIAL, y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF4_BR_INER */
     case RF4_SPELL_START + 23:  return spell_RF4_BREATH(GF_GRAVITY, y, x, m_idx, 0, MONSTER_TO_PLAYER);  /* RF4_BR_GRAV */
     case RF4_SPELL_START + 24:  return spell_RF4_BREATH(GF_SHARDS, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_SHAR */
     case RF4_SPELL_START + 25:  return spell_RF4_BREATH(GF_PLASMA, y, x, m_idx, 0, MONSTER_TO_PLAYER);   /* RF4_BR_PLAS */
@@ -3554,7 +3554,7 @@ int monspell_to_monster(int SPELL_NUM, int y, int x, int m_idx, int t_idx)
     case RF4_SPELL_START + 19:  return spell_RF4_BREATH(GF_DISENCHANT, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_DISE */
     case RF4_SPELL_START + 20:  return spell_RF4_BREATH(GF_NEXUS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);   /* RF4_BR_NEXU */
     case RF4_SPELL_START + 21:  return spell_RF4_BREATH(GF_TIME, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);    /* RF4_BR_TIME */
-    case RF4_SPELL_START + 22:  return spell_RF4_BREATH(GF_INERTIA, y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF4_BR_INER */
+    case RF4_SPELL_START + 22:  return spell_RF4_BREATH(GF_INERTIAL, y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF4_BR_INER */
     case RF4_SPELL_START + 23:  return spell_RF4_BREATH(GF_GRAVITY, y, x, m_idx, t_idx, MONSTER_TO_MONSTER); /* RF4_BR_GRAV */
     case RF4_SPELL_START + 24:  return spell_RF4_BREATH(GF_SHARDS, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_SHAR */
     case RF4_SPELL_START + 25:  return spell_RF4_BREATH(GF_PLASMA, y, x, m_idx, t_idx, MONSTER_TO_MONSTER);  /* RF4_BR_PLAS */

diff --git a/src/object2.c b/src/object2.c
index 034b5b8..0d13cce 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -7174,7 +7174,7 @@ bool process_warning(int xx, int yy)
                 if (f4 & RF4_BR_DISE) spell_damcalc_by_spellnum(MS_BR_DISEN, GF_DISENCHANT, c_ptr->m_idx, &dam_max0);
                 if (f4 & RF4_BR_NEXU) spell_damcalc_by_spellnum(MS_BR_NEXUS, GF_NEXUS, c_ptr->m_idx, &dam_max0);
                 if (f4 & RF4_BR_TIME) spell_damcalc_by_spellnum(MS_BR_TIME, GF_TIME, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_INER) spell_damcalc_by_spellnum(MS_BR_INERTIA, GF_INERTIA, c_ptr->m_idx, &dam_max0);
+                if (f4 & RF4_BR_INER) spell_damcalc_by_spellnum(MS_BR_INERTIA, GF_INERTIAL, c_ptr->m_idx, &dam_max0);
                 if (f4 & RF4_BR_GRAV) spell_damcalc_by_spellnum(MS_BR_GRAVITY, GF_GRAVITY, c_ptr->m_idx, &dam_max0);
                 if (f4 & RF4_BR_SHAR) spell_damcalc_by_spellnum(MS_BR_SHARDS, GF_SHARDS, c_ptr->m_idx, &dam_max0);
                 if (f4 & RF4_BR_PLAS) spell_damcalc_by_spellnum(MS_BR_PLASMA, GF_PLASMA, c_ptr->m_idx, &dam_max0);

diff --git a/src/spells1.c b/src/spells1.c
index 894aef0..a002ddf 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -129,7 +129,7 @@ static byte spell_color(int type)
                        case GF_SOUND:          return (0x09);
                        case GF_SHARDS:         return (0x08);
                        case GF_FORCE:          return (0x09);
-                       case GF_INERTIA:        return (0x09);
+                       case GF_INERTIAL:        return (0x09);
                        case GF_GRAVITY:        return (0x09);
                        case GF_TIME:           return (0x09);
                        case GF_LITE_WEAK:      return (0x06);
@@ -2175,7 +2175,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
                }
 
                /* Inertia -- breathers resist */
-               case GF_INERTIA:
+               case GF_INERTIAL:
                {
                        if (seen) obvious = TRUE;
 
@@ -5682,7 +5682,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
                }
 
                /* Inertia -- slowness */
-               case GF_INERTIA:
+               case GF_INERTIAL:
                {
                        if (fuzzy) msg_print(_("何か遅いもので攻撃された！", "You are hit by something slow!"));
                        if (!CHECK_MULTISHADOW()) (void)set_slow(p_ptr->slow + randint0(4) + 4, FALSE);

diff --git a/src/spells2.c b/src/spells2.c
index 3d644ae..639da2e 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -5356,7 +5356,7 @@ void call_chaos(void)
                GF_ELEC,      GF_POIS,    GF_ACID,    GF_COLD,
                GF_FIRE,      GF_MISSILE, GF_ARROW,   GF_PLASMA,
                GF_HOLY_FIRE, GF_WATER,   GF_LITE,    GF_DARK,
-               GF_FORCE,     GF_INERTIA, GF_MANA,    GF_METEOR,
+               GF_FORCE,     GF_INERTIAL, GF_MANA,    GF_METEOR,
                GF_ICE,       GF_CHAOS,   GF_NETHER,  GF_DISENCHANT,
                GF_SHARDS,    GF_SOUND,   GF_NEXUS,   GF_CONFUSION,
                GF_TIME,      GF_GRAVITY, GF_ROCKET,  GF_NUKE,