Changed Cards drawing code

grondman · Jan 13, 2012 · 2d25e13 · 2d25e13
1 parent 0408b17
commit 2d25e13
Show file tree

Hide file tree

Showing 83 changed files with 1,401 additions and 407 deletions.
diff --git a/Heads-Up Trainer/Heads-Up Trainer.sln b/Heads-Up Trainer/Heads-Up Trainer.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heads-Up Trainer", "Heads-Up Trainer\Heads-Up Trainer.csproj", "{A8CBCC41-16AF-4814-AA21-3B9165DDC3D0}"
 EndProject
 Global

diff --git a/Heads-Up Trainer/Heads-Up Trainer.suo b/Heads-Up Trainer/Heads-Up Trainer.suo
diff --git a/Heads-Up Trainer/Heads-Up Trainer/Heads-Up Trainer.csproj b/Heads-Up Trainer/Heads-Up Trainer/Heads-Up Trainer.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +13,12 @@
     <StartupObject>
     </StartupObject>
     <ApplicationIcon>kala.ico</ApplicationIcon>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <UpgradeBackupLocation />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -94,6 +101,59 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="kala.ico" />
+    <Content Include="Resources\cardSkin.bmp" />
+    <Content Include="Resources\cl10.bmp" />
+    <Content Include="Resources\cl2.bmp" />
+    <Content Include="Resources\cl3.bmp" />
+    <Content Include="Resources\cl4.bmp" />
+    <Content Include="Resources\cl5.bmp" />
+    <Content Include="Resources\cl6.bmp" />
+    <Content Include="Resources\cl7.bmp" />
+    <Content Include="Resources\cl8.bmp" />
+    <Content Include="Resources\cl9.bmp" />
+    <Content Include="Resources\cla.bmp" />
+    <Content Include="Resources\clj.bmp" />
+    <Content Include="Resources\clk.bmp" />
+    <Content Include="Resources\clq.bmp" />
+    <Content Include="Resources\di10.bmp" />
+    <Content Include="Resources\di2.bmp" />
+    <Content Include="Resources\di3.bmp" />
+    <Content Include="Resources\di4.bmp" />
+    <Content Include="Resources\di5.bmp" />
+    <Content Include="Resources\di6.bmp" />
+    <Content Include="Resources\di7.bmp" />
+    <Content Include="Resources\di8.bmp" />
+    <Content Include="Resources\di9.bmp" />
+    <Content Include="Resources\dia.bmp" />
+    <Content Include="Resources\dij.bmp" />
+    <Content Include="Resources\dik.bmp" />
+    <Content Include="Resources\diq.bmp" />
+    <Content Include="Resources\he10.bmp" />
+    <Content Include="Resources\he2.bmp" />
+    <Content Include="Resources\he3.bmp" />
+    <Content Include="Resources\he4.bmp" />
+    <Content Include="Resources\he5.bmp" />
+    <Content Include="Resources\he6.bmp" />
+    <Content Include="Resources\he7.bmp" />
+    <Content Include="Resources\he8.bmp" />
+    <Content Include="Resources\he9.bmp" />
+    <Content Include="Resources\hea.bmp" />
+    <Content Include="Resources\hej.bmp" />
+    <Content Include="Resources\hek.bmp" />
+    <Content Include="Resources\heq.bmp" />
+    <Content Include="Resources\sp10.bmp" />
+    <Content Include="Resources\sp2.bmp" />
+    <Content Include="Resources\sp3.bmp" />
+    <Content Include="Resources\sp4.bmp" />
+    <Content Include="Resources\sp5.bmp" />
+    <Content Include="Resources\sp6.bmp" />
+    <Content Include="Resources\sp7.bmp" />
+    <Content Include="Resources\sp8.bmp" />
+    <Content Include="Resources\sp9.bmp" />
+    <Content Include="Resources\spa.bmp" />
+    <Content Include="Resources\spj.bmp" />
+    <Content Include="Resources\spk.bmp" />
+    <Content Include="Resources\spq.bmp" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Heads-Up Trainer/Heads-Up Trainer/Heads-Up Trainer.csproj.user b/Heads-Up Trainer/Heads-Up Trainer/Heads-Up Trainer.csproj.user
@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishUrlHistory>publish\</PublishUrlHistory>
     <InstallUrlHistory>
@@ -9,7 +10,6 @@
     </UpdateUrlHistory>
     <BootstrapperUrlHistory>
     </BootstrapperUrlHistory>
-    <ApplicationRevision>0</ApplicationRevision>
     <FallbackCulture>en-US</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>

diff --git a/Heads-Up Trainer/Heads-Up Trainer/Heads-Up_Trainer.cs b/Heads-Up Trainer/Heads-Up Trainer/Heads-Up_Trainer.cs
@@ -21,7 +21,6 @@ public partial class Heads_Up_Trainer : Form
         private static readonly int HUMANWONALLIN = 5;
 
 
-        private cardsdll card;
         private Game game;
         private GameData data;        
         private Bitmap[] cards;
@@ -31,7 +30,6 @@ public partial class Heads_Up_Trainer : Form
 
         public Heads_Up_Trainer()
         {
-            card = new cardsdll(60, 80);
             game = new Game();
             data = new GameData();
 
@@ -585,7 +583,7 @@ private void pictureBox1_Paint(object sender, PaintEventArgs e)
 
                 for (int i = 0; i < 52; i++)
                 {
-                    card.drawCard(pictureBox1, i, (int)cardsdll.mdFaceUp, 16777215);
+                    Cards.drawCard(pictureBox1, i, Cards.mdFaceUp);
                     cards[i] = new Bitmap(pictureBox1.Image);
                     if (i / 13 == 0) // club
                     {
@@ -620,7 +618,7 @@ private void pictureBox1_Paint(object sender, PaintEventArgs e)
                     }
                 }
             }
-            card.drawCardBack(pictureBox1);
+            Cards.drawCardBack(pictureBox1);
             cards[52] = new Bitmap(pictureBox1.Image);
             pictureBox1.Visible = false;
         }