EGO_2HANDをEGO_2WEAPONに変更。2HANDは普通両手持ちの意味だろうから将来混乱を招かないように。

diff --git a/src/defines.h b/src/defines.h
index b2f371f..01898b0 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1388,7 +1388,7 @@
 #define EGO_SLAYING             49
 #define EGO_AGILITY             50
 #define EGO_POWER               51
-#define EGO_2HAND               52
+#define EGO_2WEAPON             52
 #define EGO_MAGIC_MASTERY       53
 #define EGO_WEAKNESS            54
 #define EGO_CLUMSINESS          55

diff --git a/src/object1.c b/src/object1.c
index 1905335..5295a4a 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -2594,7 +2594,7 @@ info[i++] = "
 #endif
        }
 
-       if (o_ptr->name2 == EGO_2HAND)
+       if (o_ptr->name2 == EGO_2WEAPON)
        {
 #ifdef JP
 info[i++] = "¤½¤ì¤ÏÆóÅáή¤Ç¤ÎÌ¿ÃæΨ¤ò¸þ¾å¤µ¤»¤ë¡£";

diff --git a/src/object2.c b/src/object2.c
index c027c31..6025373 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -6905,7 +6905,7 @@ static void drain_essence(void)
        {
                drain_value[ESSENCE_DEX-1] += 10;
        }
-       if (old_name2 == EGO_2HAND)
+       if (old_name2 == EGO_2WEAPON)
        {
                drain_value[ESSENCE_DEX] += 20;
        }

diff --git a/src/xtra1.c b/src/xtra1.c
index 1df7ee0..2d54b9c 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -3150,7 +3150,7 @@ void calc_bonuses(void)
        bool            yoiyami = FALSE;
        bool            down_saving = FALSE;
        bool            have_dd_s, have_dd_t, have_sw, have_kabe;
-       bool            easy_2hand = FALSE;
+       bool            easy_2weapon = FALSE;
        s16b this_o_idx, next_o_idx = 0;
        player_race *tmp_rp_ptr;
 
@@ -4060,7 +4060,7 @@ void calc_bonuses(void)
                if (f2 & (TR2_SUST_CHR)) p_ptr->sustain_chr = TRUE;
 
                if (o_ptr->name2 == EGO_YOIYAMI) yoiyami = TRUE;
-               if (o_ptr->name2 == EGO_2HAND) easy_2hand = TRUE;
+               if (o_ptr->name2 == EGO_2WEAPON) easy_2weapon = TRUE;
                if (o_ptr->name2 == EGO_RING_RES_TIME) p_ptr->resist_time = TRUE;
                if (o_ptr->name2 == EGO_RING_THROW) p_ptr->mighty_throw = TRUE;
                if (o_ptr->name2 == EGO_RING_WIZARD) p_ptr->easy_spell = TRUE;
@@ -4531,7 +4531,7 @@ void calc_bonuses(void)
                        p_ptr->to_a += 10;
                        p_ptr->dis_to_a += 10;
                }
-               if (easy_2hand)
+               if (easy_2weapon)
                {
                        if (penalty1 > 0) penalty1 /= 2;
                        if (penalty2 > 0) penalty2 /= 2;