diff options
author | Filippos Karapetis | 2019-10-08 01:52:56 +0300 |
---|---|---|
committer | Filippos Karapetis | 2019-10-08 01:52:56 +0300 |
commit | b808b572cfe119497e27ae04e4828549579dc4c4 (patch) | |
tree | 3b34815d88432e1ffe405402e2127fb995724c11 /engines | |
parent | e086ac376e95e9b62911725d10a406dcdcff9a93 (diff) | |
download | scummvm-rg350-b808b572cfe119497e27ae04e4828549579dc4c4.tar.gz scummvm-rg350-b808b572cfe119497e27ae04e4828549579dc4c4.tar.bz2 scummvm-rg350-b808b572cfe119497e27ae04e4828549579dc4c4.zip |
SCI32: Make the Hoyle 5 poker card bitmask a bit more explicit
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sci/engine/hoyle5poker.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/engine/hoyle5poker.cpp b/engines/sci/engine/hoyle5poker.cpp index c7742a273e..90a2e2b580 100644 --- a/engines/sci/engine/hoyle5poker.cpp +++ b/engines/sci/engine/hoyle5poker.cpp @@ -165,23 +165,23 @@ int checkHand(SciArray *data) { } if (pairs == 1) - return 1; // one pair + return 1 << 0; // 1, one pair else if (pairs == 2) - return 2; // two pairs + return 1 << 1; // 2, two pairs else if (sameRank == 3) - return 4; // three of a kind + return 1 << 2; // 4, three of a kind else if (orderedCards == 5 && sameSuit < 5) - return 128; // straight + return 1 << 7; // 128, straight else if (sameSuit == 5) - return 16; // flush + return 1 << 4; // 16, flush else if (cards[0] == cards[1] && cards[1] == cards[2] && cards[3] == cards[4]) - return 32; // full house + return 1 << 5; // 32, full house else if (sameRank == 4) - return 64; // four of a kind + return 1 << 6; // 64, four of a kind else if (orderedCards == 5 && sameSuit == 5) return 0; // straight flush // TODO else if (sameRank == 5) - return 256; // five of a kind + return 1 << 8; // 256, five of a kind return 0; // high card } |