From 6a643daad79440988845f9242acf50055fa17c52 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Mon, 31 Dec 2018 16:35:48 -0800 Subject: libs/grid: fix grid_ops_t.taken player type Just making things consistent, also dropping unnecessary player assert from submit module. Future libs/grid may explore using the "unassigned" zero player in taken calls for unassigning cells like in simultaneously taken collision scenarios. --- src/libs/grid/grid.h | 2 +- src/modules/submit/submit.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/libs/grid/grid.h b/src/libs/grid/grid.h index e17989f..3dae534 100644 --- a/src/libs/grid/grid.h +++ b/src/libs/grid/grid.h @@ -35,7 +35,7 @@ typedef struct grid_ops_t { void (*planned)(void *ctx, uint32_t move); /* the specified move has been planned */ void (*executed)(void *ctx, uint32_t move, grid_ops_move_result_t result);/* the specified move has been executed, removed from plan */ void (*canceled)(void *ctx, uint32_t move); /* the specified move has been canceled, removed from plan */ - void (*taken)(void *ctx, uint32_t x, uint32_t y, unsigned player); /* the specified cell has been taken by the specified player */ + void (*taken)(void *ctx, uint32_t x, uint32_t y, uint32_t player); /* the specified cell has been taken by the specified player */ void (*won)(void *ctx, uint32_t player); /* the game has been won by the specified player */ } grid_ops_t; diff --git a/src/modules/submit/submit.c b/src/modules/submit/submit.c index 9f26dc8..18886d8 100644 --- a/src/modules/submit/submit.c +++ b/src/modules/submit/submit.c @@ -14,7 +14,6 @@ * along with this program. If not, see . */ -#include #include #include #include @@ -75,12 +74,10 @@ static void draw_grid(submit_context_t *ctxt, fb_fragment_t *fragment) } -static void taken(void *ctx, uint32_t x, uint32_t y, unsigned player) +static void taken(void *ctx, uint32_t x, uint32_t y, uint32_t player) { submit_context_t *c = ctx; - assert(player); - c->cells[y * GRID_SIZE + x] = player; } -- cgit v1.2.3