summaryrefslogtreecommitdiff
path: root/src/game.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game.c')
-rw-r--r--src/game.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/game.c b/src/game.c
index 96a987c..d872bca 100644
--- a/src/game.c
+++ b/src/game.c
@@ -9,8 +9,10 @@
#include <curses.h>
#include "ui.h"
-void init_mainstack(card* stack, const uint32_t size)
+void init_mainstack(card *stack, const uint32_t size)
{
+ assert(stack != NULL);
+
// assign card values to main stack
for(uint32_t i=0, val=MIN_CARD; i<size; i++, val++)
stack[i] = val;
@@ -28,6 +30,8 @@ void init_mainstack(card* stack, const uint32_t size)
void start_game(const bool servermode, const char *addr, const uint16_t port)
{
+ assert(addr != NULL);
+
bool running = true;
int cards = MAX_CARD - MIN_CARD + 1;
card mainstack[cards];
@@ -38,7 +42,11 @@ void start_game(const bool servermode, const char *addr, const uint16_t port)
init_mainstack(mainstack, cards);
// Example data set for table cards window
- const tablestacks ts = {{1, 2, 3, 4, 101}, {6, 7, 53, 0, 0}, {11, 55, 0, 0, 0}, {17, 29, 36, 42, 0}};
+ const card_stack_t _cs1 = { { 1, 2, 3, 4, 101 } };
+ const card_stack_t _cs2 = { { 6, 7, 53, 0, 0 } };
+ const card_stack_t _cs3 = { { 11, 55, 0, 0, 0 } };
+ const card_stack_t _cs4 = { { 17, 29, 36, 42, 0 } };
+ const table_stacks_t ts = { { _cs1, _cs2, _cs3, _cs4 } };
// The stack points window uses ts, too, so there is no separate data set
@@ -64,8 +72,8 @@ void start_game(const bool servermode, const char *addr, const uint16_t port)
hand_sort(&h);
// Display all windows
- ui_display_wnd_table_cards(ts, false, 0);
- ui_display_wnd_stack_points(ts, false, 0);
+ ui_display_wnd_table_cards(&ts, false, 0);
+ ui_display_wnd_stack_points(&ts, false, 0);
ui_display_wnd_current_state(pnoc, num_players, 2, score);
ui_display_wnd_hand_cards(&h, false, 0);
@@ -95,4 +103,3 @@ void start_game(const bool servermode, const char *addr, const uint16_t port)
}
}
}
-