summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorMario Kilies <MarioKilies@GMX.net>2011-01-24 18:56:32 +0100
committerMario Kilies <MarioKilies@GMX.net>2011-01-24 18:56:32 +0100
commita24153f14dcc95332b91e70e39028228e9b6c4dc (patch)
tree04bb60f0192627ba61ae0b67665cf0634713b238 /src/net
parent5ab5af3b1472fe93eb164f5bbece798a402eea65 (diff)
First attempt to implement STATE_CLIENT_WAIT_FOR_HAND_CARDS.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/client.h1
-rw-r--r--src/net/comm.c3
-rw-r--r--src/net/server.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/net/client.h b/src/net/client.h
index 29f9720..918b98f 100644
--- a/src/net/client.h
+++ b/src/net/client.h
@@ -14,5 +14,6 @@ void client_prep_selected_stack(msg_t *m);
bool client_parse_player_list(const msg_t *m);
bool client_parse_deal_hand(const msg_t *m);
bool client_parse_selected_stack(const msg_t *m);
+bool client_parse_initial_stacks(const msg_t *m);
#endif // OXEN_CLIENT_H
diff --git a/src/net/comm.c b/src/net/comm.c
index 0cb6233..7f9c6c4 100644
--- a/src/net/comm.c
+++ b/src/net/comm.c
@@ -39,8 +39,7 @@ bool net_recv(const int sock, const msg_type_t type)
result = client_parse_deal_hand(&m);
break;
case msg_type_initial_stacks:
- printf("not yet implemented: msg_type_initial_stacks\n");
- exit(EXIT_FAILURE);
+ result = client_parse_initial_stacks(&m);
break;
case msg_type_selected_card:
result = server_parse_selected_card(&m);
diff --git a/src/net/server.c b/src/net/server.c
index 1e35efd..c6c4613 100644
--- a/src/net/server.c
+++ b/src/net/server.c
@@ -184,6 +184,8 @@ void server_prep_selected_stack(msg_t *m)
void server_prep_deal_hand(msg_t *m, const hand_t *h)
{
+ assert(h != NULL);
+
m->hdr.type = msg_type_deal_hand;
for(int i=0; i<MAX_HAND_CARDS; i++)