Merge pull request #35 from sorenhein/lasttrick-really-final

Lasttrick really final

Author: sorenhein

src/SolverIF.cpp

@@ -1103,7 +1103,7 @@ void LastTrickWinner(
   {
     hp = handId(dl->first, h);
     lastTrickSuit[hp] = dl->currentTrickSuit[h];
-    lastTrickRank[hp] = bitMapRank[dl->currentTrickRank[h]];
+    lastTrickRank[hp] = dl->currentTrickRank[h];
   }
 
   for (h = handRelFirst; h < DDS_HANDS; h++)
@@ -1114,7 +1114,7 @@ void LastTrickWinner(
       if (thrp->suit[hp][s] != 0)
       {
         lastTrickSuit[hp] = s;
-        lastTrickRank[hp] = thrp->suit[hp][s];
+        lastTrickRank[hp] = highestRank[thrp->suit[hp][s]];
         break;
       }
     }
@@ -1157,8 +1157,9 @@ void LastTrickWinner(
     }
   }
 
-  * leadRank = lastTrickRank[handRelFirst];
-  * leadSuit = lastTrickSuit[handRelFirst];
+  hp = handId(dl->first, handRelFirst);
+  * leadRank = lastTrickRank[hp];
+  * leadSuit = lastTrickSuit[hp];
   * leadSideWins = ((handToPlay == maxHand ||
                      partner[handToPlay] == maxHand) ? 1 : 0);
 }