diff options
author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-12-11 05:52:32 +0100 |
---|---|---|
committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-12-11 05:52:32 +0100 |
commit | 95afa341a9cc098538d799d3691e3bafa09068ac (patch) | |
tree | d41fceded1e11a04ce0f5109b85edc0da8547039 /server/score.cpp | |
parent | 18dc83a5e528bf3b5f2b3129a25832854b42780c (diff) |
Seperate han into yaku and dora.
Diffstat (limited to 'server/score.cpp')
-rw-r--r-- | server/score.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/server/score.cpp b/server/score.cpp index 1af1d63..4589efe 100644 --- a/server/score.cpp +++ b/server/score.cpp @@ -8,28 +8,32 @@ inline int max(int x, int y) { return x > y ? x : y; } -Score::Score(int han_, int fu_) : han(han_), fu(fu_) { +Score::Score(int yaku_, int fu_, int dora_) : yaku(yaku_), fu(fu_), dora(dora_) { } +int Score::han() { + return yaku + dora; +} + int Score::base_points() { - if(han < 5) { + if(han() < 5) { // Normal hand. - return max(roundup(fu, 10) << (2 + han), 2000); + return max(roundup(fu, 10) << (2 + han()), 2000); - } else if(han <= 5) { + } else if(han() <= 5) { // Mangan. return 2000; - } else if(han <= 7) { + } else if(han() <= 7) { // Haneman. return 3000; - } else if(han <= 10) { + } else if(han() <= 10) { // Baiman. return 4000; - } else if(han <= 12) { + } else if(han() <= 12) { // Sanbaiman. return 6000; |