diff options
| -rw-r--r-- | server.c | 16 | ||||
| -rw-r--r-- | torus.h | 8 |
2 files changed, 13 insertions, 11 deletions
diff --git a/server.c b/server.c index 78752f5..a0d18da 100644 --- a/server.c +++ b/server.c @@ -97,10 +97,10 @@ static struct Client *clientAdd(int fd) { if (!client) err(EX_OSERR, "malloc"); client->fd = fd; - client->tileX = UINT32_MAX; - client->tileY = UINT32_MAX; - client->cellX = UINT8_MAX; - client->cellY = UINT8_MAX; + client->tileX = TILE_VOID_X; + client->tileY = TILE_VOID_Y; + client->cellX = CELL_INIT_X; + client->cellY = CELL_INIT_Y; client->prev = NULL; if (clientHead) { @@ -211,17 +211,17 @@ static bool clientUpdate(struct Client *client, struct Client *old) { .newCellX = client->cellX, .newCellY = client->cellY, }, }; - clientCast(client, &msg); + clientCast(client, msg); } return true; } static bool clientSpawn(struct Client *client, uint8_t spawn) { - if (spawn >= SPAWN_COUNT) return false; + if (spawn >= SPAWNS_LEN) return false; struct Client old = *client; - client->tileX = SPAWN[spawn].tileX; - client->tileY = SPAWN[spawn].tileY; + client->tileX = SPAWNS[spawn].tileX; + client->tileY = SPAWNS[spawn].tileY; client->cellX = CELL_INIT_X; client->cellY = CELL_INIT_Y; return clientUpdate(client, &old); diff --git a/torus.h b/torus.h index f2588a4..e9fa2d1 100644 --- a/torus.h +++ b/torus.h @@ -68,18 +68,20 @@ static_assert(2016 == offsetof(struct Tile, colors), "stable colors offset"); #define TILE_COLS (512) #define TILES_SIZE (sizeof(struct Tile[TILE_ROWS][TILE_COLS])) +#define TILE_VOID_X UINT32_MAX +#define TILE_VOID_Y UINT32_MAX + static const struct { uint32_t tileX; uint32_t tileY; -} SPAWN[] = { +} SPAWNS[] = { { 0, 0 }, { TILE_COLS * 3 / 4, TILE_ROWS * 3 / 4 }, // NW { TILE_COLS * 1 / 4, TILE_ROWS * 3 / 4 }, // NE { TILE_COLS * 1 / 4, TILE_ROWS * 1 / 4 }, // SE { TILE_COLS * 3 / 4, TILE_ROWS * 1 / 4 }, // SW }; - -#define SPAWN_COUNT (sizeof(SPAWN) / sizeof(SPAWN[0])) +#define SPAWNS_LEN (sizeof(SPAWNS) / sizeof(SPAWNS[0])) struct ServerMessage { enum PACKED { |