diff --git a/console/src/ConsoleCallback.cs b/console/src/ConsoleCallback.cs index 047f41c9..13eb96db 100644 --- a/console/src/ConsoleCallback.cs +++ b/console/src/ConsoleCallback.cs @@ -85,6 +85,11 @@ namespace pokerth_console Console.WriteLine("{0} {1}.", name, Log.ActionToString(action, curBet)); } + public void ActionRejected() + { + Console.WriteLine("Your action was rejected by the server."); + } + public void ShowFlopCards(int[] cards) { Console.WriteLine("\n--- Flop --- [{0}, {1}, {2}]", diff --git a/console/src/lib/ICallback.cs b/console/src/lib/ICallback.cs index bf074998..416cf444 100644 --- a/console/src/lib/ICallback.cs +++ b/console/src/lib/ICallback.cs @@ -34,6 +34,7 @@ namespace pokerth_lib void MyTurn(Hand.State state, uint highestSet, uint minimumRaise, uint money); void PlayersTurn(Hand.State state, string player); void ActionDone(string name, Hand.Action action, uint curBet); + void ActionRejected(); void ShowFlopCards(int[] cards); void ShowTurnCards(int[] cards); void ShowRiverCards(int[] cards); diff --git a/console/src/lib/net/Client.cs b/console/src/lib/net/Client.cs index 5c2e57a7..e867c785 100644 --- a/console/src/lib/net/Client.cs +++ b/console/src/lib/net/Client.cs @@ -39,11 +39,11 @@ namespace pokerth_lib { // Connect to the server. // Try IPv6 first. - /*IPAddress[] addresses = new IPAddress[2]; + IPAddress[] addresses = new IPAddress[2]; addresses[0] = IPAddress.Parse(m_settings.ServerSettings.IPv6Address); addresses[1] = IPAddress.Parse(m_settings.ServerSettings.IPv4Address); - m_tcpClient.Connect(addresses, m_settings.ServerSettings.Port);*/ - m_tcpClient.Connect("localhost", 7234); + m_tcpClient.Connect(addresses, m_settings.ServerSettings.Port); + //m_tcpClient.Connect("localhost", 7234); } public void Start() diff --git a/console/src/lib/net/NetPacket.cs b/console/src/lib/net/NetPacket.cs index 0f63b422..8a2006c0 100644 --- a/console/src/lib/net/NetPacket.cs +++ b/console/src/lib/net/NetPacket.cs @@ -202,6 +202,9 @@ namespace pokerth_lib case NetTypePlayersActionDone : tmpPacket = new NetPacketPlayersActionDone(size, reader); break; + case NetTypePlayersActionRejected : + tmpPacket = new NetPacketPlayersActionRejected(size, reader); + break; case NetTypeDealFlopCards : tmpPacket = new NetPacketDealFlopCards(size, reader); break; diff --git a/console/src/lib/net/NetParser.cs b/console/src/lib/net/NetParser.cs index a1070815..9f9292a2 100644 --- a/console/src/lib/net/NetParser.cs +++ b/console/src/lib/net/NetParser.cs @@ -245,7 +245,7 @@ namespace pokerth_lib public void VisitPlayersActionRejected(NetPacket p) { - // TODO + m_callback.ActionRejected(); } public void VisitDealFlopCards(NetPacket p)