- update cards.dll to use GPL cards which don't resemble the Windows counterparts

- cards taken from http://sourceforge.net/projects/macsolitairex

svn path=/trunk/; revision=28064

diff --git a/reactos/dll/win32/cards/cards.h b/reactos/dll/win32/cards/cards.h
index 44ff440..bdf60b4 100644 (file)
--- a/reactos/dll/win32/cards/cards.h
+++ b/reactos/dll/win32/cards/cards.h
@@ -46,9 +46,9 @@
 #define CARD_WIDTH             71
 #define CARD_HEIGHT            96
 */
-/* Oxymoron's card dimensions */
-#define CARD_WIDTH             73
-#define CARD_HEIGHT            97
+/* MacSolitaireX's card dimensions */
+#define CARD_WIDTH             72
+#define CARD_HEIGHT            96
 
 #define ISREDCARD(x)   (x >= 13 && x <= 39)
 

diff --git a/reactos/dll/win32/cards/res/Background_1.bmp b/reactos/dll/win32/cards/res/Background_1.bmp
index 9cdd6a3..1278d27 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Background_1.bmp and b/reactos/dll/win32/cards/res/Background_1.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Ace.bmp b/reactos/dll/win32/cards/res/Clubs_Ace.bmp
index 951ae73..cd88bc6 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Ace.bmp and b/reactos/dll/win32/cards/res/Clubs_Ace.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Eight.bmp b/reactos/dll/win32/cards/res/Clubs_Eight.bmp
index 586478a..33ff9dc 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Eight.bmp and b/reactos/dll/win32/cards/res/Clubs_Eight.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Five.bmp b/reactos/dll/win32/cards/res/Clubs_Five.bmp
index 625851b..1687c30 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Five.bmp and b/reactos/dll/win32/cards/res/Clubs_Five.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Four.bmp b/reactos/dll/win32/cards/res/Clubs_Four.bmp
index 79da1a6..e96a39e 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Four.bmp and b/reactos/dll/win32/cards/res/Clubs_Four.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Jack.bmp b/reactos/dll/win32/cards/res/Clubs_Jack.bmp
index 923b0b1..852d8e0 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Jack.bmp and b/reactos/dll/win32/cards/res/Clubs_Jack.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_King.bmp b/reactos/dll/win32/cards/res/Clubs_King.bmp
index ca3d840..4d6ec72 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_King.bmp and b/reactos/dll/win32/cards/res/Clubs_King.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Nine.bmp b/reactos/dll/win32/cards/res/Clubs_Nine.bmp
index 4f796ad..d7c03a4 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Nine.bmp and b/reactos/dll/win32/cards/res/Clubs_Nine.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Queen.bmp b/reactos/dll/win32/cards/res/Clubs_Queen.bmp
index 7f4fbed..5e161ed 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Queen.bmp and b/reactos/dll/win32/cards/res/Clubs_Queen.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Seven.bmp b/reactos/dll/win32/cards/res/Clubs_Seven.bmp
index c5697e2..4e503e4 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Seven.bmp and b/reactos/dll/win32/cards/res/Clubs_Seven.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Six.bmp b/reactos/dll/win32/cards/res/Clubs_Six.bmp
index 301e749..6e7f2e4 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Six.bmp and b/reactos/dll/win32/cards/res/Clubs_Six.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Ten.bmp b/reactos/dll/win32/cards/res/Clubs_Ten.bmp
index 38ad58f..c352154 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Ten.bmp and b/reactos/dll/win32/cards/res/Clubs_Ten.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Three.bmp b/reactos/dll/win32/cards/res/Clubs_Three.bmp
index 8a2dfa5..c87f8cf 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Three.bmp and b/reactos/dll/win32/cards/res/Clubs_Three.bmp differ

diff --git a/reactos/dll/win32/cards/res/Clubs_Two.bmp b/reactos/dll/win32/cards/res/Clubs_Two.bmp
index e1066ae..3f7adcc 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Clubs_Two.bmp and b/reactos/dll/win32/cards/res/Clubs_Two.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Ace.bmp b/reactos/dll/win32/cards/res/Diamonds_Ace.bmp
index 27ba5b4..50683fe 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Ace.bmp and b/reactos/dll/win32/cards/res/Diamonds_Ace.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Eight.bmp b/reactos/dll/win32/cards/res/Diamonds_Eight.bmp
index b156af4..2d64a18 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Eight.bmp and b/reactos/dll/win32/cards/res/Diamonds_Eight.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Five.bmp b/reactos/dll/win32/cards/res/Diamonds_Five.bmp
index d7b7e7c..5e85354 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Five.bmp and b/reactos/dll/win32/cards/res/Diamonds_Five.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Four.bmp b/reactos/dll/win32/cards/res/Diamonds_Four.bmp
index 77b234e..7f30c18 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Four.bmp and b/reactos/dll/win32/cards/res/Diamonds_Four.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Jack.bmp b/reactos/dll/win32/cards/res/Diamonds_Jack.bmp
index 31f7beb..8b05491 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Jack.bmp and b/reactos/dll/win32/cards/res/Diamonds_Jack.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_King.bmp b/reactos/dll/win32/cards/res/Diamonds_King.bmp
index b791a55..a44cef7 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_King.bmp and b/reactos/dll/win32/cards/res/Diamonds_King.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Nine.bmp b/reactos/dll/win32/cards/res/Diamonds_Nine.bmp
index 7be3f3f..9e6d7a7 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Nine.bmp and b/reactos/dll/win32/cards/res/Diamonds_Nine.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Queen.bmp b/reactos/dll/win32/cards/res/Diamonds_Queen.bmp
index 03c79ca..32865ee 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Queen.bmp and b/reactos/dll/win32/cards/res/Diamonds_Queen.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Seven.bmp b/reactos/dll/win32/cards/res/Diamonds_Seven.bmp
index 14ee716..141fcdf 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Seven.bmp and b/reactos/dll/win32/cards/res/Diamonds_Seven.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Six.bmp b/reactos/dll/win32/cards/res/Diamonds_Six.bmp
index 8724bf1..af3c2ee 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Six.bmp and b/reactos/dll/win32/cards/res/Diamonds_Six.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Ten.bmp b/reactos/dll/win32/cards/res/Diamonds_Ten.bmp
index 4890c6d..08d933d 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Ten.bmp and b/reactos/dll/win32/cards/res/Diamonds_Ten.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Three.bmp b/reactos/dll/win32/cards/res/Diamonds_Three.bmp
index 97cf6d6..e2714fd 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Three.bmp and b/reactos/dll/win32/cards/res/Diamonds_Three.bmp differ

diff --git a/reactos/dll/win32/cards/res/Diamonds_Two.bmp b/reactos/dll/win32/cards/res/Diamonds_Two.bmp
index 7f2c127..2355479 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Diamonds_Two.bmp and b/reactos/dll/win32/cards/res/Diamonds_Two.bmp differ

diff --git a/reactos/dll/win32/cards/res/FreeCard.bmp b/reactos/dll/win32/cards/res/FreeCard.bmp
index 984b0ad..c91b956 100644 (file)
Binary files a/reactos/dll/win32/cards/res/FreeCard.bmp and b/reactos/dll/win32/cards/res/FreeCard.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Ace.bmp b/reactos/dll/win32/cards/res/Hearts_Ace.bmp
index c3a23cf..447173b 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Ace.bmp and b/reactos/dll/win32/cards/res/Hearts_Ace.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Eight.bmp b/reactos/dll/win32/cards/res/Hearts_Eight.bmp
index 2d2a67d..caf92e0 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Eight.bmp and b/reactos/dll/win32/cards/res/Hearts_Eight.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Five.bmp b/reactos/dll/win32/cards/res/Hearts_Five.bmp
index 5ed15b2..caed8d1 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Five.bmp and b/reactos/dll/win32/cards/res/Hearts_Five.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Four.bmp b/reactos/dll/win32/cards/res/Hearts_Four.bmp
index c0242d8..b5ab123 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Four.bmp and b/reactos/dll/win32/cards/res/Hearts_Four.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Jack.bmp b/reactos/dll/win32/cards/res/Hearts_Jack.bmp
index 49f2082..5ca222a 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Jack.bmp and b/reactos/dll/win32/cards/res/Hearts_Jack.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_King.bmp b/reactos/dll/win32/cards/res/Hearts_King.bmp
index c1659d2..3950e29 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_King.bmp and b/reactos/dll/win32/cards/res/Hearts_King.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Nine.bmp b/reactos/dll/win32/cards/res/Hearts_Nine.bmp
index 8d1ddb8..d74410a 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Nine.bmp and b/reactos/dll/win32/cards/res/Hearts_Nine.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Queen.bmp b/reactos/dll/win32/cards/res/Hearts_Queen.bmp
index 71746cb..67eb551 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Queen.bmp and b/reactos/dll/win32/cards/res/Hearts_Queen.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Seven.bmp b/reactos/dll/win32/cards/res/Hearts_Seven.bmp
index c068878..8633633 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Seven.bmp and b/reactos/dll/win32/cards/res/Hearts_Seven.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Six.bmp b/reactos/dll/win32/cards/res/Hearts_Six.bmp
index c45367e..5261911 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Six.bmp and b/reactos/dll/win32/cards/res/Hearts_Six.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Ten.bmp b/reactos/dll/win32/cards/res/Hearts_Ten.bmp
index 1b3e44d..3a0c0f4 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Ten.bmp and b/reactos/dll/win32/cards/res/Hearts_Ten.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Three.bmp b/reactos/dll/win32/cards/res/Hearts_Three.bmp
index cef3460..7061abf 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Three.bmp and b/reactos/dll/win32/cards/res/Hearts_Three.bmp differ

diff --git a/reactos/dll/win32/cards/res/Hearts_Two.bmp b/reactos/dll/win32/cards/res/Hearts_Two.bmp
index 9342a9c..28f0027 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Hearts_Two.bmp and b/reactos/dll/win32/cards/res/Hearts_Two.bmp differ

diff --git a/reactos/dll/win32/cards/res/Joker.bmp b/reactos/dll/win32/cards/res/Joker.bmp
index 1e2b495..d34c801 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Joker.bmp and b/reactos/dll/win32/cards/res/Joker.bmp differ

diff --git a/reactos/dll/win32/cards/res/OSign.bmp b/reactos/dll/win32/cards/res/OSign.bmp
index e1da137..e4d498b 100644 (file)
Binary files a/reactos/dll/win32/cards/res/OSign.bmp and b/reactos/dll/win32/cards/res/OSign.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Ace.bmp b/reactos/dll/win32/cards/res/Spades_Ace.bmp
index be1f61a..571dea6 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Ace.bmp and b/reactos/dll/win32/cards/res/Spades_Ace.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Eight.bmp b/reactos/dll/win32/cards/res/Spades_Eight.bmp
index 46dbf26..72200d7 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Eight.bmp and b/reactos/dll/win32/cards/res/Spades_Eight.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Five.bmp b/reactos/dll/win32/cards/res/Spades_Five.bmp
index 3778d09..003d0b8 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Five.bmp and b/reactos/dll/win32/cards/res/Spades_Five.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Four.bmp b/reactos/dll/win32/cards/res/Spades_Four.bmp
index 17c9385..3ad9c3d 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Four.bmp and b/reactos/dll/win32/cards/res/Spades_Four.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Jack.bmp b/reactos/dll/win32/cards/res/Spades_Jack.bmp
index 508be3d..86c3ca9 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Jack.bmp and b/reactos/dll/win32/cards/res/Spades_Jack.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_King.bmp b/reactos/dll/win32/cards/res/Spades_King.bmp
index d0992ad..8041d7a 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_King.bmp and b/reactos/dll/win32/cards/res/Spades_King.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Nine.bmp b/reactos/dll/win32/cards/res/Spades_Nine.bmp
index 72a19bc..ad5a8f3 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Nine.bmp and b/reactos/dll/win32/cards/res/Spades_Nine.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Queen.bmp b/reactos/dll/win32/cards/res/Spades_Queen.bmp
index a5627f8..853b2d6 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Queen.bmp and b/reactos/dll/win32/cards/res/Spades_Queen.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Seven.bmp b/reactos/dll/win32/cards/res/Spades_Seven.bmp
index 3afe69e..52d1b86 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Seven.bmp and b/reactos/dll/win32/cards/res/Spades_Seven.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Six.bmp b/reactos/dll/win32/cards/res/Spades_Six.bmp
index 7f9c489..23b7a99 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Six.bmp and b/reactos/dll/win32/cards/res/Spades_Six.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Ten.bmp b/reactos/dll/win32/cards/res/Spades_Ten.bmp
index 06d3ff3..5c79452 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Ten.bmp and b/reactos/dll/win32/cards/res/Spades_Ten.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Three.bmp b/reactos/dll/win32/cards/res/Spades_Three.bmp
index f2f8328..7c44da6 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Three.bmp and b/reactos/dll/win32/cards/res/Spades_Three.bmp differ

diff --git a/reactos/dll/win32/cards/res/Spades_Two.bmp b/reactos/dll/win32/cards/res/Spades_Two.bmp
index a271ccf..88f8ac5 100644 (file)
Binary files a/reactos/dll/win32/cards/res/Spades_Two.bmp and b/reactos/dll/win32/cards/res/Spades_Two.bmp differ

diff --git a/reactos/dll/win32/cards/res/XSign.bmp b/reactos/dll/win32/cards/res/XSign.bmp
index 3e1eb3b..c4700ab 100644 (file)
Binary files a/reactos/dll/win32/cards/res/XSign.bmp and b/reactos/dll/win32/cards/res/XSign.bmp differ