diff --git a/PuzzlePlayer/BlackJack.cs b/PuzzlePlayer/BlackJack.cs index d0235b75c3b9a9bdbd505b142f309ce232097151..7cc03dac2ab70eb0f9a502ebd07acfabc6073b2a 100644 --- a/PuzzlePlayer/BlackJack.cs +++ b/PuzzlePlayer/BlackJack.cs @@ -34,7 +34,6 @@ namespace PuzzlePlayer_Namespace BJRESULTS result; bool roundFinished = false; bool resultReady = false; - int money; int deployedMoney = 0; readonly FontFamily BJFont = FontFamily.GenericSansSerif; readonly int defaultFontSize; @@ -65,7 +64,6 @@ namespace PuzzlePlayer_Namespace defaultFontSize = screen.Width / 50; - money = ReadMoney(); cardsLeft = getAllCards(); SetupUI(); @@ -96,11 +94,6 @@ namespace PuzzlePlayer_Namespace return cards; } - private int ReadMoney() //TODO read money from local file - { - return 1000; - } - private void SetupUI() { //setup @@ -205,10 +198,10 @@ namespace PuzzlePlayer_Namespace Button b = (Button) sender; (int, string, Color) chip = chipInfo[int.Parse(b.Name)]; - if(money >= chip.Item1) + if(UserDataManager.Money >= chip.Item1) { deployedMoney += chip.Item1; - money -= chip.Item1; + UserDataManager.Money -= chip.Item1; } Invalidate(true); } @@ -264,10 +257,10 @@ namespace PuzzlePlayer_Namespace break; case BJRESULTS.Won: case BJRESULTS.Blackjack: - money += deployedMoney * 2; + UserDataManager.Money += deployedMoney * 2; break; case BJRESULTS.Draw: - money += deployedMoney; + UserDataManager.Money += deployedMoney; break; } @@ -401,7 +394,7 @@ namespace PuzzlePlayer_Namespace private void DrawMoney(Graphics g) { Font moneyFont = new Font(BJFont, defaultFontSize, FontStyle.Bold); - g.DrawString("Money: $" + money.ToString(), moneyFont, Brushes.Black, new PointF(0, 0)); + g.DrawString("Money: $" + UserDataManager.Money.ToString(), moneyFont, Brushes.Black, new PointF(0, 0)); } private void Result_Paint(Graphics g) diff --git a/PuzzlePlayer/PuzzlePlayer.csproj b/PuzzlePlayer/PuzzlePlayer.csproj index 88cac412d371659fbbb3b6d4fd4a7e92b55e1ac9..1277244d130adb3c9820fd435976bbf28210ce0d 100644 --- a/PuzzlePlayer/PuzzlePlayer.csproj +++ b/PuzzlePlayer/PuzzlePlayer.csproj @@ -80,7 +80,6 @@ <ItemGroup> <EmbeddedResource Include="Resources\Binary.jpg" /> <EmbeddedResource Include="Resources\BinaryGray.jpg" /> - <EmbeddedResource Include="Resources\bj.jpg" /> <EmbeddedResource Include="Resources\blackjackImg.jpg" /> <EmbeddedResource Include="Resources\blackjackImgGray.jpg" /> <EmbeddedResource Include="Resources\BlackJack\cards\10_of_clubs.png" />