2 files changed, 78 insertions, 0 deletions

diff --git a/games/CaribbeanStud/files/patch-Bitmaps.h b/games/CaribbeanStud/files/patch-Bitmaps.h
new file mode 100644
index 000000000000..6ad2afd3d455
--- /dev/null
+++ b/games/CaribbeanStud/files/patch-Bitmaps.h
@@ -0,0 +1,47 @@
+--- Bitmaps.h.orig	1997-01-31 22:47:58 UTC
++++ Bitmaps.h
+@@ -32,7 +32,7 @@
+  */
+ 
+ 
+-const char c_bits[][2018] = {  // bitmaps for Clubs
++const unsigned char c_bits[][2018] = {  // bitmaps for Clubs
+ {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+@@ -1647,7 +1647,7 @@ const char c_bits[][2018] = {  // bitmaps for Clubs
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }
+ };
+ 
+-const char d_bits[][2018] = {  // Bitmaps for Dimands
++const unsigned char d_bits[][2018] = {  // Bitmaps for Dimands
+ 	{
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+@@ -3263,7 +3263,7 @@ const char d_bits[][2018] = {  // Bitmaps for Dimands
+ };
+ 
+ 
+-const char h_bits[][2018] = {  // Bitmaps for Hearts
++const unsigned char h_bits[][2018] = {  // Bitmaps for Hearts
+ 	{
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+@@ -4879,7 +4879,7 @@ const char h_bits[][2018] = {  // Bitmaps for Hearts
+ };
+ 
+ 
+-const char s_bits[][2018] = {  // Bitmaps for Spades
++const unsigned char s_bits[][2018] = {  // Bitmaps for Spades
+ 	{
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+@@ -6494,7 +6494,7 @@ const char s_bits[][2018] = {  // Bitmaps for Spades
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+ };
+ 
+-const char back_bits[] = {  // Bitmap for CardBack
++const unsigned char back_bits[] = {  // Bitmap for CardBack
+    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x01, 0x80, 0x00, 0xa0,
+    0x00, 0x00, 0x04, 0x20, 0x10, 0x02, 0x08, 0x01, 0x40, 0x00, 0x04, 0x10,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,
diff --git a/games/CaribbeanStud/files/patch-Seat.cpp b/games/CaribbeanStud/files/patch-Seat.cpp
index d859ff10701e..48d525376b84 100644
--- a/games/CaribbeanStud/files/patch-Seat.cpp
+++ b/games/CaribbeanStud/files/patch-Seat.cpp
@@ -13,6 +13,37 @@
  	i = 0;
  	XtSetArg(args[i], XmNbackground, color.pixel);   i++;
  	XtSetArg(args[i], XmNforeground, whitepixel);   i++;
+@@ -255,25 +255,25 @@ void Seat::MakeCardMaps()
+    for (int i = 0; i< 13; i++) {
+       s_map[i] = XCreateBitmapFromData(_dpy,
+          RootWindow(_dpy, _screen),
+-         s_bits[i], CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
++         reinterpret_cast<const char *>(s_bits[i]), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
+  
+       h_map[i] = XCreateBitmapFromData(_dpy,
+          RootWindow(_dpy, _screen),
+-         h_bits[i], CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
++         reinterpret_cast<const char *>(h_bits[i]), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
+  
+       c_map[i] = XCreateBitmapFromData(_dpy,
+          RootWindow(_dpy, _screen),
+-         c_bits[i], CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
++         reinterpret_cast<const char *>(c_bits[i]), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
+  
+       d_map[i] = XCreateBitmapFromData(_dpy,
+          RootWindow(_dpy, _screen),
+-         d_bits[i], CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
++         reinterpret_cast<const char *>(d_bits[i]), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
+  
+    }
+ 
+    back_map = XCreateBitmapFromData(_dpy,
+       RootWindow(_dpy, _screen),
+-      back_bits, CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
++      reinterpret_cast<const char *>(back_bits), CARD_MAP_WIDTH, CARD_MAP_HEIGHT);
+  
+ }
+ 
 @@ -342,7 +342,8 @@
     Card ** cards = hands->Cards();
     if( hands->NumOfCards() )