Merge pull request #25 from dds-bridge/lasttrick-bug

Fixes bugs in LastTrickWinner
dds-bridge · Jan 5, 2015 · 7e5694b · 7e5694b
2 parents 5fdd2d3 + 6a8d1a2
commit 7e5694b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/SolverIF.cpp b/src/SolverIF.cpp
@@ -1103,7 +1103,7 @@ void LastTrickWinner(
   {
     hp = handId(dl->first, h);
     lastTrickSuit[hp] = dl->currentTrickSuit[h];
-    lastTrickRank[hp] = dl->currentTrickRank[h];
+    lastTrickRank[hp] = bitMapRank[dl->currentTrickRank[h]];
   }
 
   for (h = handRelFirst; h < DDS_HANDS; h++)
@@ -1157,8 +1157,8 @@ void LastTrickWinner(
     }
   }
 
-  * leadRank = lastTrickRank[handRelFirst];
-  * leadSuit = lastTrickSuit[handRelFirst];
+  * leadRank = highestRank[maxRank];
+  * leadSuit = maxSuit;
   * leadSideWins = ((handToPlay == maxHand ||
                      partner[handToPlay] == maxHand) ? 1 : 0);
 }