From c9804cee9be73b405070b86d940683619beecf00 Mon Sep 17 00:00:00 2001
From: Deskull <desull@users.sourceforge.jp>
Date: Thu, 24 Aug 2017 00:17:35 +0900
Subject: [PATCH] =?utf8?q?#37454=20(2.2.0.51)=20=E3=82=AB=E3=82=B8?=
 =?utf8?q?=E3=83=8E=E3=81=AE=E3=83=9D=E3=83=BC=E3=82=AB=E3=83=BC=E3=81=A7?=
 =?utf8?q?=E4=B8=80=E9=83=A8=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=96?=
 =?utf8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=82=92=E3=83=95=E3=82=A1=E3=82=A4?=
 =?utf8?q?=E3=83=96=E3=82=A8=E3=83=BC=E3=82=B9=E3=81=A8=E3=81=97=E3=81=A6?=
 =?utf8?q?=E6=89=B1=E3=81=86=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE?=
 =?utf8?q?=E6=AD=A3=E3=80=82=20/=20Fix=20a=20bug=20that=20parts=20of=20fiv?=
 =?utf8?q?e=20cards=20were=20treated=20ad=20five=20aces=20in=20poker=20of?=
 =?utf8?q?=20casino.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/bldg.c    | 18 +++++++++++++++++-
 src/defines.h |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/bldg.c b/src/bldg.c
index 3e3b45bca..9b4ad3ac8 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -681,7 +681,7 @@ static int yaku_check(void)
 		c_put_str(TERM_YELLOW, _("フォーカード", "Four of a kind"),  4,  3);
 		return ODDS_4C;
 	case 7:
-		if (!NUM_OF(cards[0]) || !NUM_OF(cards[1]))
+		if (!NUM_OF(cards[0]) && !NUM_OF(cards[1]))
 		{
 			c_put_str(TERM_YELLOW, _("ファイブエース", "Five ace"),  4,  3);
 			return ODDS_5A;
@@ -1051,6 +1051,22 @@ static int do_poker(void)
 	cards[4] = 3;
 #endif
 #if 0
+	/* debug:Five Card1 */
+	cards[0] = 4;
+	cards[1] = 52;
+	cards[2] = 4 + 13;
+	cards[3] = 4 + 26;
+	cards[4] = 4 + 39;
+#endif
+#if 0
+	/* debug:Five Card2 */
+	cards[1] = 52;
+	cards[0] = 4;
+	cards[2] = 4 + 13;
+	cards[3] = 4 + 26;
+	cards[4] = 4 + 39;
+#endif
+#if 0
 	/* debug */
 	cards[0] = 52;
 	cards[1] = 0;
diff --git a/src/defines.h b/src/defines.h
index 80c22057e..64a7e37d1 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 50 /*!< ゲームのバージョン番号定義(エクストラ番号) */
+#define FAKE_VER_EXTRA 51 /*!< ゲームのバージョン番号定義(エクストラ番号) */
 
 
  /*!
-- 
2.11.0