Merge the cards of "cardsbav" to our cards.dll and specify, which cards shall be compiled into the cards.dll, with preprocessor definitions in cards.rbuild.

This change obsoletes the old cardsbav.dll, so I removed it.

svn path=/trunk/; revision=29630

reactos/dll/win32/cards/cards.h

@@ -41,14 +41,15 @@
 #define ectGREENO			7
 #define ectSAVEEDGESMASK	0x80000000
 
-/* Microsoft card dimensions */
-/*
-#define CARD_WIDTH		71
-#define CARD_HEIGHT		96
-*/
-/* MacSolitaireX's card dimensions */
-#define CARD_WIDTH		72
+#if defined(CARDSTYLE_DEFAULT)
+#	define CARD_WIDTH		72	// The original Microsoft cards are 71px wide, but ours are taken from MacSolitaireX
 #	define CARD_HEIGHT		96
+#elif defined(CARDSTYLE_BAVARIAN)
+#	define CARD_WIDTH		110
+#	define CARD_HEIGHT		198
+#else
+#	error No or unsupported cardstyle defined
+#endif
 
 #define ISREDCARD(x)	(x >= 13 && x <= 39)
 

reactos/dll/win32/cards/cards.rbuild

@@ -4,6 +4,10 @@
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="__USE_W32API" />
+	
+	<!-- Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN -->
+	<define name="CARDSTYLE_DEFAULT" />
+	
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>

reactos/dll/win32/cards/cards.rc

@@ -28,71 +28,146 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-1 BITMAP "res/Clubs_Ace.bmp"
-2 BITMAP "res/Clubs_Two.bmp"
-3 BITMAP "res/Clubs_Three.bmp"
-4 BITMAP "res/Clubs_Four.bmp"
-5 BITMAP "res/Clubs_Five.bmp"
-6 BITMAP "res/Clubs_Six.bmp"
-7 BITMAP "res/Clubs_Seven.bmp"
-8 BITMAP "res/Clubs_Eight.bmp"
-9 BITMAP "res/Clubs_Nine.bmp"
-10 BITMAP "res/Clubs_Ten.bmp"
-11 BITMAP "res/Clubs_Jack.bmp"
-12 BITMAP "res/Clubs_Queen.bmp"
-13 BITMAP "res/Clubs_King.bmp"
-14 BITMAP "res/Diamonds_Ace.bmp"
-15 BITMAP "res/Diamonds_Two.bmp"
-16 BITMAP "res/Diamonds_Three.bmp"
-17 BITMAP "res/Diamonds_Four.bmp"
-18 BITMAP "res/Diamonds_Five.bmp"
-19 BITMAP "res/Diamonds_Six.bmp"
-20 BITMAP "res/Diamonds_Seven.bmp"
-21 BITMAP "res/Diamonds_Eight.bmp"
-22 BITMAP "res/Diamonds_Nine.bmp"
-23 BITMAP "res/Diamonds_Ten.bmp"
-24 BITMAP "res/Diamonds_Jack.bmp"
-25 BITMAP "res/Diamonds_Queen.bmp"
-26 BITMAP "res/Diamonds_King.bmp"
-27 BITMAP "res/Hearts_Ace.bmp"
-28 BITMAP "res/Hearts_Two.bmp"
-29 BITMAP "res/Hearts_Three.bmp"
-30 BITMAP "res/Hearts_Four.bmp"
-31 BITMAP "res/Hearts_Five.bmp"
-32 BITMAP "res/Hearts_Six.bmp"
-33 BITMAP "res/Hearts_Seven.bmp"
-34 BITMAP "res/Hearts_Eight.bmp"
-35 BITMAP "res/Hearts_Nine.bmp"
-36 BITMAP "res/Hearts_Ten.bmp"
-37 BITMAP "res/Hearts_Jack.bmp"
-38 BITMAP "res/Hearts_Queen.bmp"
-39 BITMAP "res/Hearts_King.bmp"
-40 BITMAP "res/Spades_Ace.bmp"
-41 BITMAP "res/Spades_Two.bmp"
-42 BITMAP "res/Spades_Three.bmp"
-43 BITMAP "res/Spades_Four.bmp"
-44 BITMAP "res/Spades_Five.bmp"
-45 BITMAP "res/Spades_Six.bmp"
-46 BITMAP "res/Spades_Seven.bmp"
-47 BITMAP "res/Spades_Eight.bmp"
-48 BITMAP "res/Spades_Nine.bmp"
-49 BITMAP "res/Spades_Ten.bmp"
-50 BITMAP "res/Spades_Jack.bmp"
-51 BITMAP "res/Spades_Queen.bmp"
-52 BITMAP "res/Spades_King.bmp"
-53 BITMAP "res/FreeCard.bmp"
-54 BITMAP "res/Background_1.bmp"
-55 BITMAP "res/Background_2.bmp"
-56 BITMAP "res/Background_3.bmp"
-57 BITMAP "res/Background_4.bmp"
-58 BITMAP "res/Background_5.bmp"
-59 BITMAP "res/Background_6.bmp"
-60 BITMAP "res/Background_7.bmp"
-61 BITMAP "res/Background_8.bmp"
-62 BITMAP "res/Background_9.bmp"
-63 BITMAP "res/Background_10.bmp"
-64 BITMAP "res/Background_11.bmp"
-65 BITMAP "res/Background_12.bmp"
-66 BITMAP "res/Joker.bmp"
-67 BITMAP "res/XSign.bmp"
-68 BITMAP "res/OSign.bmp"
+#if defined(CARDSTYLE_DEFAULT)
+	1  BITMAP "res/default/Clubs_Ace.bmp"
+	2  BITMAP "res/default/Clubs_Two.bmp"
+	3  BITMAP "res/default/Clubs_Three.bmp"
+	4  BITMAP "res/default/Clubs_Four.bmp"
+	5  BITMAP "res/default/Clubs_Five.bmp"
+	6  BITMAP "res/default/Clubs_Six.bmp"
+	7  BITMAP "res/default/Clubs_Seven.bmp"
+	8  BITMAP "res/default/Clubs_Eight.bmp"
+	9  BITMAP "res/default/Clubs_Nine.bmp"
+	10 BITMAP "res/default/Clubs_Ten.bmp"
+	11 BITMAP "res/default/Clubs_Jack.bmp"
+	12 BITMAP "res/default/Clubs_Queen.bmp"
+	13 BITMAP "res/default/Clubs_King.bmp"
+	14 BITMAP "res/default/Diamonds_Ace.bmp"
+	15 BITMAP "res/default/Diamonds_Two.bmp"
+	16 BITMAP "res/default/Diamonds_Three.bmp"
+	17 BITMAP "res/default/Diamonds_Four.bmp"
+	18 BITMAP "res/default/Diamonds_Five.bmp"
+	19 BITMAP "res/default/Diamonds_Six.bmp"
+	20 BITMAP "res/default/Diamonds_Seven.bmp"
+	21 BITMAP "res/default/Diamonds_Eight.bmp"
+	22 BITMAP "res/default/Diamonds_Nine.bmp"
+	23 BITMAP "res/default/Diamonds_Ten.bmp"
+	24 BITMAP "res/default/Diamonds_Jack.bmp"
+	25 BITMAP "res/default/Diamonds_Queen.bmp"
+	26 BITMAP "res/default/Diamonds_King.bmp"
+	27 BITMAP "res/default/Hearts_Ace.bmp"
+	28 BITMAP "res/default/Hearts_Two.bmp"
+	29 BITMAP "res/default/Hearts_Three.bmp"
+	30 BITMAP "res/default/Hearts_Four.bmp"
+	31 BITMAP "res/default/Hearts_Five.bmp"
+	32 BITMAP "res/default/Hearts_Six.bmp"
+	33 BITMAP "res/default/Hearts_Seven.bmp"
+	34 BITMAP "res/default/Hearts_Eight.bmp"
+	35 BITMAP "res/default/Hearts_Nine.bmp"
+	36 BITMAP "res/default/Hearts_Ten.bmp"
+	37 BITMAP "res/default/Hearts_Jack.bmp"
+	38 BITMAP "res/default/Hearts_Queen.bmp"
+	39 BITMAP "res/default/Hearts_King.bmp"
+	40 BITMAP "res/default/Spades_Ace.bmp"
+	41 BITMAP "res/default/Spades_Two.bmp"
+	42 BITMAP "res/default/Spades_Three.bmp"
+	43 BITMAP "res/default/Spades_Four.bmp"
+	44 BITMAP "res/default/Spades_Five.bmp"
+	45 BITMAP "res/default/Spades_Six.bmp"
+	46 BITMAP "res/default/Spades_Seven.bmp"
+	47 BITMAP "res/default/Spades_Eight.bmp"
+	48 BITMAP "res/default/Spades_Nine.bmp"
+	49 BITMAP "res/default/Spades_Ten.bmp"
+	50 BITMAP "res/default/Spades_Jack.bmp"
+	51 BITMAP "res/default/Spades_Queen.bmp"
+	52 BITMAP "res/default/Spades_King.bmp"
+	53 BITMAP "res/default/FreeCard.bmp"
+	54 BITMAP "res/default/Background_1.bmp"
+	55 BITMAP "res/default/Background_2.bmp"
+	56 BITMAP "res/default/Background_3.bmp"
+	57 BITMAP "res/default/Background_4.bmp"
+	58 BITMAP "res/default/Background_5.bmp"
+	59 BITMAP "res/default/Background_6.bmp"
+	60 BITMAP "res/default/Background_7.bmp"
+	61 BITMAP "res/default/Background_8.bmp"
+	62 BITMAP "res/default/Background_9.bmp"
+	63 BITMAP "res/default/Background_10.bmp"
+	64 BITMAP "res/default/Background_11.bmp"
+	65 BITMAP "res/default/Background_12.bmp"
+	66 BITMAP "res/default/Joker.bmp"
+	67 BITMAP "res/default/XSign.bmp"
+	68 BITMAP "res/default/OSign.bmp"
+
+#elif defined(CARDSTYLE_BAVARIAN)
+	1  BITMAP "res/bavarian/EichelAs.bmp"
+	2  BITMAP "res/bavarian/Eichel2.bmp"
+	3  BITMAP "res/bavarian/Eichel3.bmp"
+	4  BITMAP "res/bavarian/Eichel4.bmp"
+	5  BITMAP "res/bavarian/Eichel5.bmp"
+	6  BITMAP "res/bavarian/Eichel6.bmp"
+	7  BITMAP "res/bavarian/Eichel7.bmp"
+	8  BITMAP "res/bavarian/Eichel8.bmp"
+	9  BITMAP "res/bavarian/Eichel9.bmp"
+	10 BITMAP "res/bavarian/Eichel10.bmp"
+	11 BITMAP "res/bavarian/EichelUnter.bmp"
+	12 BITMAP "res/bavarian/EichelOber.bmp"
+	13 BITMAP "res/bavarian/EichelKoenig.bmp"
+	14 BITMAP "res/bavarian/SchellenAs.bmp"
+	15 BITMAP "res/bavarian/Schellen2.bmp"
+	16 BITMAP "res/bavarian/Schellen3.bmp"
+	17 BITMAP "res/bavarian/Schellen4.bmp"
+	18 BITMAP "res/bavarian/Schellen5.bmp"
+	19 BITMAP "res/bavarian/Schellen6.bmp"
+	20 BITMAP "res/bavarian/Schellen7.bmp"
+	21 BITMAP "res/bavarian/Schellen8.bmp"
+	22 BITMAP "res/bavarian/Schellen9.bmp"
+	23 BITMAP "res/bavarian/Schellen10.bmp"
+	24 BITMAP "res/bavarian/SchellenUnter.bmp"
+	25 BITMAP "res/bavarian/SchellenOber.bmp"
+	26 BITMAP "res/bavarian/SchellenKoenig.bmp"
+	27 BITMAP "res/bavarian/HerzAs.bmp"
+	28 BITMAP "res/bavarian/Herz2.bmp"
+	29 BITMAP "res/bavarian/Herz3.bmp"
+	30 BITMAP "res/bavarian/Herz4.bmp"
+	31 BITMAP "res/bavarian/Herz5.bmp"
+	32 BITMAP "res/bavarian/Herz6.bmp"
+	33 BITMAP "res/bavarian/Herz7.bmp"
+	34 BITMAP "res/bavarian/Herz8.bmp"
+	35 BITMAP "res/bavarian/Herz9.bmp"
+	36 BITMAP "res/bavarian/Herz10.bmp"
+	37 BITMAP "res/bavarian/HerzUnter.bmp"
+	38 BITMAP "res/bavarian/HerzOber.bmp"
+	39 BITMAP "res/bavarian/HerzKoenig.bmp"
+	40 BITMAP "res/bavarian/GrasAs.bmp"
+	41 BITMAP "res/bavarian/Gras2.bmp"
+	42 BITMAP "res/bavarian/Gras3.bmp"
+	43 BITMAP "res/bavarian/Gras4.bmp"
+	44 BITMAP "res/bavarian/Gras5.bmp"
+	45 BITMAP "res/bavarian/Gras6.bmp"
+	46 BITMAP "res/bavarian/Gras7.bmp"
+	47 BITMAP "res/bavarian/Gras8.bmp"
+	48 BITMAP "res/bavarian/Gras9.bmp"
+	49 BITMAP "res/bavarian/Gras10.bmp"
+	50 BITMAP "res/bavarian/GrasUnter.bmp"
+	51 BITMAP "res/bavarian/GrasOber.bmp"
+	52 BITMAP "res/bavarian/GrasKoenig.bmp"
+	53 BITMAP "res/bavarian/FreeCard.bmp"
+	54 BITMAP "res/bavarian/Ruecken.bmp"
+	55 BITMAP "res/bavarian/Ruecken.bmp"
+	56 BITMAP "res/bavarian/Ruecken.bmp"
+	57 BITMAP "res/bavarian/Ruecken.bmp"
+	58 BITMAP "res/bavarian/Ruecken.bmp"
+	59 BITMAP "res/bavarian/Ruecken.bmp"
+	60 BITMAP "res/bavarian/Ruecken.bmp"
+	61 BITMAP "res/bavarian/Ruecken.bmp"
+	62 BITMAP "res/bavarian/Ruecken.bmp"
+	63 BITMAP "res/bavarian/Ruecken.bmp"
+	64 BITMAP "res/bavarian/Ruecken.bmp"
+	65 BITMAP "res/bavarian/Ruecken.bmp"
+	66 BITMAP "res/bavarian/Joker.bmp"
+	67 BITMAP "res/bavarian/XSign.bmp"
+	68 BITMAP "res/bavarian/OSign.bmp"
+
+#else
+#	error No or unsupported cardstyle defined
+#endif