From 04763aadc90d23e707308fa0c2d5de87ebd7cb92 Mon Sep 17 00:00:00 2001 From: Jeff Wang Date: Sun, 24 Dec 2017 14:53:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E7=89=8C=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=94=B9=E4=B8=BAuint8=5Ft?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Classes/RecordSystem/RecordScene.cpp | 2 +- Classes/mahjong-algorithm/fan_calculator.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/RecordSystem/RecordScene.cpp b/Classes/RecordSystem/RecordScene.cpp index 3eb3365c..90ada7b0 100644 --- a/Classes/RecordSystem/RecordScene.cpp +++ b/Classes/RecordSystem/RecordScene.cpp @@ -884,7 +884,7 @@ void RecordScene::calculate(TilePickWidget *tilePicker, ExtraInfoWidget *extraIn return; } - temp.flower_count = extraInfo->getFlowerCount(); + temp.flower_count = static_cast(extraInfo->getFlowerCount()); if (temp.flower_count > 8) { AlertView::showWithMessage("记录和牌", "花牌数的范围为0~8", 12, std::bind(&RecordScene::showCalculator, this, param), nullptr); return; diff --git a/Classes/mahjong-algorithm/fan_calculator.h b/Classes/mahjong-algorithm/fan_calculator.h index b97d1e69..3bf6d1fc 100644 --- a/Classes/mahjong-algorithm/fan_calculator.h +++ b/Classes/mahjong-algorithm/fan_calculator.h @@ -193,7 +193,7 @@ int check_calculator_input(const hand_tiles_t *hand_tiles, tile_t win_tile); struct calculate_param_t { hand_tiles_t hand_tiles; ///< 手牌 tile_t win_tile; ///< 和牌张 - int flower_count; ///< 花牌数 + uint8_t flower_count; ///< 花牌数 win_flag_t win_flag; ///< 和牌标记 wind_t prevalent_wind; ///< 圈风 wind_t seat_wind; ///< 门风