From 0184d53f37d50f9316c4ddbcde76e96c862276d7 Mon Sep 17 00:00:00 2001 From: Apricot-S Date: Wed, 25 Sep 2024 22:21:31 +0000 Subject: [PATCH] refactor: Use constants instead of magic numbers --- src/standard.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/standard.rs b/src/standard.rs index d7435db..e1ad187 100644 --- a/src/standard.rs +++ b/src/standard.rs @@ -3,7 +3,7 @@ // This file is part of https://github.com/Apricot-S/xiangting use crate::bingpai::Bingpai; -use crate::constants::NUM_TILE_INDEX; +use crate::constants::{MAX_NUM_SHOUPAI, NUM_TILE_INDEX}; use crate::shoupai::{FuluMianziList, FuluMianziListExt}; use bitvec::prelude::*; @@ -182,9 +182,9 @@ fn calculate_replacement_number_formula( mut num_gulipai: u8, has_jiangpai: bool, ) -> u8 { - debug_assert!(num_mianzi <= 4); - debug_assert!(num_mianzi_candidate <= 7); - debug_assert!(num_gulipai <= 14); + debug_assert!(num_mianzi <= (MAX_NUM_SHOUPAI / 3)); + debug_assert!(num_mianzi_candidate <= (MAX_NUM_SHOUPAI / 2)); + debug_assert!(num_gulipai <= MAX_NUM_SHOUPAI); // Adjust for excess meld candidates if (num_mianzi + num_mianzi_candidate) > 4 {