From 32838e337dd387e48039b85154bcb5b4e38ab98c Mon Sep 17 00:00:00 2001
From: Deskull <desull@users.sourceforge.jp>
Date: Mon, 17 Jul 2017 00:04:32 +0900
Subject: [PATCH] =?utf8?q?#37287=20(2.2.0.33)=20=E7=AA=81=E7=84=B6?=
 =?utf8?q?=E5=A4=89=E7=95=B0=E3=81=A7=E7=94=9F=E3=81=88=E3=81=9F=E9=83=A8?=
 =?utf8?q?=E4=BD=8D=E3=81=AB=E3=82=88=E3=82=8B=E3=80=81=E3=83=80=E3=83=A1?=
 =?utf8?q?=E3=83=BC=E3=82=B8=E3=83=80=E3=82=A4=E3=82=B9=E3=81=AE=E6=95=B0?=
 =?utf8?q?=E3=81=A8=E9=9D=A2=E3=81=8C=E9=80=86=E3=81=AB=E5=85=A5=E5=8A=9B?=
 =?utf8?q?=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E4=B8=8D=E5=85=B7?=
 =?utf8?q?=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3=20/=20Fix=20error=20of=20da?=
 =?utf8?q?mage=20roll=20process=20by=20mutation=20body.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd1.c    | 26 +++++++++++++-------------
 src/defines.h |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/cmd1.c b/src/cmd1.c
index 1125f5a3f..f93372daf 100644
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -1425,49 +1425,49 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
 	monster_race    *r_ptr = &r_info[m_ptr->r_idx];
 	char            m_name[80];
 
-	int             dss, ddd;
+	int             dice_num, dice_side;
 
 	cptr            atk_desc;
 
 	switch (attack)
 	{
 		case MUT2_SCOR_TAIL:
-			dss = 3;
-			ddd = 7;
+			dice_num = 3;
+			dice_side = 7;
 			n_weight = 5;
 			atk_desc = _("尻尾", "tail");
 
 			break;
 		case MUT2_HORNS:
-			dss = 2;
-			ddd = 6;
+			dice_num = 2;
+			dice_side = 6;
 			n_weight = 15;
 			atk_desc = _("角", "horns");
 
 			break;
 		case MUT2_BEAK:
-			dss = 2;
-			ddd = 4;
+			dice_num = 2;
+			dice_side = 4;
 			n_weight = 5;
 			atk_desc = _("クチバシ", "beak");
 
 			break;
 		case MUT2_TRUNK:
-			dss = 1;
-			ddd = 4;
+			dice_num = 1;
+			dice_side = 4;
 			n_weight = 35;
 			atk_desc = _("象の鼻", "trunk");
 
 			break;
 		case MUT2_TENTACLES:
-			dss = 2;
-			ddd = 5;
+			dice_num = 2;
+			dice_side = 5;
 			n_weight = 5;
 			atk_desc = _("触手", "tentacles");
 
 			break;
 		default:
-			dss = ddd = n_weight = 1;
+			dice_num = dice_side = n_weight = 1;
 			atk_desc = _("未定義の部位", "undefined body part");
 
 	}
@@ -1488,7 +1488,7 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
 		sound(SOUND_HIT);
 		msg_format(_("%sを%sで攻撃した。", "You hit %s with your %s."), m_name, atk_desc);
 
-		k = damroll(ddd, dss);
+		k = damroll(dice_num, dice_side);
 		k = critical_norm(n_weight, bonus, k, (s16b)bonus, 0);
 
 		/* Apply the player damage bonuses */
diff --git a/src/defines.h b/src/defines.h
index 838ead8e4..689b591e6 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -53,7 +53,7 @@
 #define FAKE_VER_MAJOR 12 /*!< ゲームのバージョン番号定義(メジャー番号 + 10) */
 #define FAKE_VER_MINOR 2 /*!< ゲームのバージョン番号定義(マイナー番号) */
 #define FAKE_VER_PATCH 0 /*!< ゲームのバージョン番号定義(パッチ番号) */
-#define FAKE_VER_EXTRA 32 /*!< ゲームのバージョン番号定義(エクストラ番号) */
+#define FAKE_VER_EXTRA 33 /*!< ゲームのバージョン番号定義(エクストラ番号) */
 
 
  /*!
-- 
2.11.0