Merge branch 'master' of ssh://git@wg.reiner-h.de:22003/~git/oxen

2 files changed, 7 insertions, 7 deletions

diff --git a/src/net/server.c b/src/net/server.c
index 2975ec9..f1d1dfc 100644
--- a/src/net/server.c
+++ b/src/net/server.c
@@ -137,16 +137,17 @@ bool server_parse_selected_card(const msg_t *m)
 	return true;
 }
 
-uint8_t* server_parse_selected_stack(const msg_t *m)
+bool server_parse_selected_stack(const msg_t *m)
 {
 	assert(m != NULL);
 	assert(m->hdr.payload_length == 1);
 
-	uint8_t* index = malloc(sizeof(uint8_t));
-	assert(index != NULL);
-	*index = m->payload[0];
+	data_store* ds = datamodel();
+	ds->stack_index = m->payload[0];
 
-	return index;
+	assert(ds->stack_index <= NUM_TABLE_STACKS);
+
+	return true;
 }
 
 void server_prep_start_game(msg_t *m)
@@ -193,7 +194,6 @@ void server_prep_deal_hand(msg_t *m, const hand_t *h)
 	m->hdr.payload_length = MAX_HAND_CARDS;
 }
 
-
 void server_prep_initial_stacks(msg_t *m)
 {
 	data_store_t *ds = data_store();
diff --git a/src/net/server.h b/src/net/server.h
index 8c2d195..3522e14 100644
--- a/src/net/server.h
+++ b/src/net/server.h
@@ -26,6 +26,6 @@ void server_prep_selected_card_all(msg_t *m);
 
 bool server_parse_hello(const msg_t *m);
 bool server_parse_selected_card(const msg_t *m);
-uint8_t* server_parse_selected_stack(const msg_t *m);
+bool server_parse_selected_stack(const msg_t *m);
 
 #endif // OXEN_SERVER_H