From d4511f6ffa1ee7a831475e43f6d563f4b3276abe Mon Sep 17 00:00:00 2001 From: CrystalMoogle Date: Sun, 16 Jul 2023 15:54:53 +0100 Subject: [PATCH] Specify data types for parameters --- BlackjackGUI/game.vb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/BlackjackGUI/game.vb b/BlackjackGUI/game.vb index e3e8382..838f276 100644 --- a/BlackjackGUI/game.vb +++ b/BlackjackGUI/game.vb @@ -15,9 +15,9 @@ player.Start() dealer.Start() DealCard(player) - DealCard(dealer, isDealer:=True) + DealCard(dealer) DealCard(player) - DealCard(dealer, isDealer:=True, hide:=True) + DealCard(dealer, hide:=True) CheckPlayer(player) CheckPlayer(dealer, True) End Sub @@ -27,7 +27,7 @@ deck = CreateDeck() RaiseEvent ResetUI() End Sub - Sub DealCard(playerDealt, Optional isDealer = False, Optional hide = False) + Sub DealCard(playerDealt As Object, Optional hide As Boolean = False) Dim card As Tuple(Of String, String) = deck(0) playerDealt.hand.Add(card) deck.RemoveAt(0) @@ -35,12 +35,12 @@ If hide Then playerDealt.hidden = card End If - Dim cardNumber As String = If(isDealer, (playerDealt.hand.Count + 5).ToString(), playerDealt.hand.Count) + Dim cardNumber As String = If(TypeOf playerDealt Is Dealer, (playerDealt.hand.Count + 5).ToString(), playerDealt.hand.Count) RaiseEvent CardDealt(card, cardNumber, hide) RaiseEvent SetTotalLabels(player.total, dealer.total) End Sub - Sub GetTotal(playerToCheck, Optional hide = False) + Sub GetTotal(playerToCheck As Object, Optional hide As Boolean = False) If hide Then Exit Sub End If @@ -69,15 +69,15 @@ End While playerToCheck.total = total End Sub - Sub CheckPlayer(playerToCheck, Optional peek = False) - If playerToCheck.total = 21 And playerToCheck.hand.count = 2 And peek Then + Sub CheckPlayer(playerToCheck As Object, Optional peek As Boolean = False) + If playerToCheck.total = 21 And playerToCheck.hand.Count = 2 And peek Then playerToCheck.winType = WinCondition.Blackjack playerToCheck.ingame = False player.ingame = False DealerTurn() Exit Sub End If - If playerToCheck.total = 21 And playerToCheck.hand.count = 2 Then + If playerToCheck.total = 21 And playerToCheck.hand.Count = 2 Then playerToCheck.winType = WinCondition.Blackjack playerToCheck.ingame = False dealer.ingame = False @@ -86,7 +86,7 @@ playerToCheck.winType = WinCondition.Bust playerToCheck.ingame = False DealerTurn() - ElseIf playerToCheck.total < 22 And playerToCheck.hand.count = 5 Then + ElseIf playerToCheck.total < 22 And playerToCheck.hand.Count = 5 Then playerToCheck.winType = WinCondition.FiveCard playerToCheck.ingame = False dealer.ingame = False @@ -114,7 +114,7 @@ dealer.winType = WinCondition.Bust player.ingame = False ElseIf dealer.total < dealer.limit Then - DealCard(dealer, isDealer:=True) + DealCard(dealer) DealerTurn() Else dealer.winType = WinCondition.NormalWin