From 69eef3080baa6f196d15367dc3f56927fc6a1a20 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Tue, 1 Jun 2004 02:21:50 +0000
Subject: Fix the blackjack build in another way.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2334 df743ca5-7f9a-e211-a948-0013205c9059
---
 games/gnomegames2/Makefile                         |  1 -
 .../files/patch-blackjack_src_player.cpp           | 75 ++++++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 games/gnomegames2/files/patch-blackjack_src_player.cpp

(limited to 'games/gnomegames2')

diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 19570d993..12df1a5c8 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -34,6 +34,5 @@ CONFLICTS=	sol-1.0.*
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
-	@${REINPLACE_CMD} -e '/%[85].2lf%%/s|.2lf%%|.2f%%|g' ${WRKSRC}/blackjack/src/player.cpp
 
 .include <bsd.port.mk>
diff --git a/games/gnomegames2/files/patch-blackjack_src_player.cpp b/games/gnomegames2/files/patch-blackjack_src_player.cpp
new file mode 100644
index 000000000..7ee5d6f24
--- /dev/null
+++ b/games/gnomegames2/files/patch-blackjack_src_player.cpp
@@ -0,0 +1,75 @@
+--- blackjack/src/player.cpp.orig	Mon May 31 16:07:01 2004
++++ blackjack/src/player.cpp	Mon May 31 16:13:37 2004
+@@ -262,8 +262,8 @@
+         // Player can always stand.
+ 
+         bestValue = value = getValueStand (*player, upCard);
+-        mark_list[num_options++] = g_strdup_printf ("  %s     %8.2lf%%\n", 
+-                                                    _("Stand"), value * 100);
++        mark_list[num_options++] = g_strdup_printf ("  %s     %8.2Lf%%\n", 
++                                                    _("Stand"), (long double)(value * 100));
+         bestOption = KEY_S;
+         bestOptionNumber = num_options;
+ 
+@@ -271,8 +271,8 @@
+         if (bj_hand_can_be_hit ()) {
+                 value = getValueHit (*player, upCard);
+                 
+-                mark_list[num_options++] = g_strdup_printf ("  %s       %8.2lf%%\n", 
+-                                                            _("Hit"), value * 100);
++                mark_list[num_options++] = g_strdup_printf ("  %s       %8.2Lf%%\n", 
++                                                            _("Hit"), (long double)(value * 100));
+                 if (value > bestValue) {
+                         bestValue = value;
+                         bestOption = KEY_H;
+@@ -282,8 +282,8 @@
+                 // Check if player can double down.
+                 if (bj_hand_can_be_doubled ()) {
+                         value = getValueDoubleDown (*player, upCard);
+-                        mark_list[num_options++] = g_strdup_printf ("  %s    %8.2lf%%\n", 
+-                                                                    _("Double"), value * 100);
++                        mark_list[num_options++] = g_strdup_printf ("  %s    %8.2Lf%%\n", 
++                                                                    _("Double"), (long double)(value * 100));
+                         if (value > bestValue) {
+                                 bestValue = value;
+                                 bestOption = KEY_D;
+@@ -296,8 +296,8 @@
+ 
+         if (bj_hand_can_be_split ()) {
+                 value = getValueSplit(player->cards[0].value (), upCard);
+-                mark_list[num_options++] = g_strdup_printf ("  %s     %8.2lf%%\n", 
+-                                                            _("Split"), value * 100);
++                mark_list[num_options++] = g_strdup_printf ("  %s     %8.2Lf%%\n", 
++                                                            _("Split"), (long double)(value * 100));
+                 if (value > bestValue) {
+                         bestValue = value;
+                         bestOption = KEY_P;
+@@ -308,8 +308,8 @@
+         // Check if player can surrender.
+         if (bj_hand_can_be_surrendered ()) {
+                 value = -0.5;
+-                mark_list[num_options++] = g_strdup_printf ("  %s %8.2lf%%\n", 
+-                                                            _("Surrender"), value * 100);
++                mark_list[num_options++] = g_strdup_printf ("  %s %8.2Lf%%\n", 
++                                                            _("Surrender"), (long double)(value * 100));
+                 if (value > bestValue) {
+                         bestValue = value;
+                         bestOption = KEY_R;
+@@ -439,12 +439,12 @@
+         reset ();
+ 
+         mark_list[0] = g_strdup_printf ("<b>%s</b>\n", _("Dealer hand probabilities"));
+-        mark_list[1] = g_strdup_printf ("  %s         %5.2lf%%\n", _("Bust"),
+-                                        getProbabilityBust (upCard) * 100.0 / notBlackjack);
++        mark_list[1] = g_strdup_printf ("  %s         %5.2Lf%%\n", _("Bust"),
++                                        (long double)(getProbabilityBust (upCard) * 100.0 / notBlackjack));
+         for (int count = 17; count <= 21; count++) {
+-                mark_list[count-15] = g_strdup_printf ("  %2d           %5.2lf%%\n", count,
+-                                                       getProbabilityCount (count, upCard)
+-                                                       * 100.0 / notBlackjack);
++                mark_list[count-15] = g_strdup_printf ("  %2d           %5.2Lf%%\n", count,
++                                                       (long double)(getProbabilityCount (count, upCard)
++                                                       * 100.0 / notBlackjack));
+         }
+ 
+         markup = g_strconcat ("<span size=\"small\" font_family=\"monospace\" foreground=\"#eaeac1\">", 
-- 
cgit v1.2.3