From 306b27986ce6b51499d7db83009f51093a516901 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Mon, 31 Jul 2017 00:22:07 -0400 Subject: Handle large moves --- server.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'server.c') diff --git a/server.c b/server.c index 8892d2d..cea66c1 100755 --- a/server.c +++ b/server.c @@ -129,13 +129,17 @@ static bool clientCast(struct Client *origin, const struct ServerMessage *msg) { return success; } -static bool clientMove(struct Client *client, int8_t dx, uint8_t dy) { +static bool clientMove(struct Client *client, int8_t dx, int8_t dy) { struct Client old = *client; + if (dx > CELL_COLS - client->cellX) dx = CELL_COLS - client->cellX; + if (dx < -client->cellX - 1) dx = -client->cellX - 1; + if (dy > CELL_ROWS - client->cellY) dy = CELL_ROWS - client->cellY; + if (dy < -client->cellY - 1) dy = -client->cellY - 1; + client->cellX += dx; client->cellY += dy; - // TODO: Handle moves greater than 1 in either direction. if (client->cellX == CELL_COLS) { client->tileX++; client->cellX = 0; } if (client->cellX == UINT8_MAX) { client->tileX--; client->cellX = CELL_COLS - 1; } if (client->cellY == CELL_ROWS) { client->tileY++; client->cellY = 0; } -- cgit 1.4.1