修复副露字牌的问题

summerinsects · summerinsects · commit a15cefb14651 · 2024-01-17T23:37:39.000+08:00
diff --git a/Classes/mahjong-algorithm/stringify.cpp b/Classes/mahjong-algorithm/stringify.cpp
@@ -103,7 +103,7 @@ static intptr_t make_fixed_pack(const tile_t *tiles, intptr_t tile_cnt, pack_t *
             if (tiles[0] == tiles[1] && tiles[1] == tiles[2]) {
                 *pack = make_pack(offer, PACK_TYPE_PUNG, tiles[0]);
             }
-            else {
+            else if (!is_honor(tiles[0])) {
                 if ((tiles[0] + 1 == tiles[1] && tiles[1] + 1 == tiles[2])
                     || (tiles[2] + 1 == tiles[1] && tiles[1] + 1 == tiles[0])) {
                     *pack = make_pack(offer, PACK_TYPE_CHOW, tiles[1]);
@@ -120,6 +120,9 @@ static intptr_t make_fixed_pack(const tile_t *tiles, intptr_t tile_cnt, pack_t *
                     return PARSE_ERROR_CANNOT_MAKE_FIXED_PACK;
                 }
             }
+            else {
+                return PARSE_ERROR_CANNOT_MAKE_FIXED_PACK;
+            }
         }
         else {
             if (tiles[0] != tiles[1] || tiles[1] != tiles[2] || tiles[2] != tiles[3]) {

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ static intptr_t make_fixed_pack(const tile_t tiles, intptr_t tile_cnt, pack_t `
`103`	`103`	`if (tiles[0] == tiles[1] && tiles[1] == tiles[2]) {`
`104`	`104`	`*pack = make_pack(offer, PACK_TYPE_PUNG, tiles[0]);`
`105`	`105`	`}`
`106`		`- else {`
	`106`	`+ else if (!is_honor(tiles[0])) {`
`107`	`107`	`if ((tiles[0] + 1 == tiles[1] && tiles[1] + 1 == tiles[2])`
`108`	`108`	`\|\| (tiles[2] + 1 == tiles[1] && tiles[1] + 1 == tiles[0])) {`
`109`	`109`	`*pack = make_pack(offer, PACK_TYPE_CHOW, tiles[1]);`
`@@ -120,6 +120,9 @@ static intptr_t make_fixed_pack(const tile_t tiles, intptr_t tile_cnt, pack_t `
`120`	`120`	`return PARSE_ERROR_CANNOT_MAKE_FIXED_PACK;`
`121`	`121`	`}`
`122`	`122`	`}`
	`123`	`+ else {`
	`124`	`+ return PARSE_ERROR_CANNOT_MAKE_FIXED_PACK;`
	`125`	`+ }`
`123`	`126`	`}`
`124`	`127`	`else {`
`125`	`128`	`if (tiles[0] != tiles[1] \|\| tiles[1] != tiles[2] \|\| tiles[2] != tiles[3]) {`