From d62213de382d6d7f2c311a74041ce2cf8436e46f Mon Sep 17 00:00:00 2001 From: Quinn Date: Thu, 13 Feb 2025 22:47:00 +0100 Subject: [PATCH] - `game_data` -> `gamedata` - `render_data` -> `renderdata` --- src/game/game.c | 8 ++++---- src/game/game.h | 8 ++++---- src/main.c | 4 ++-- src/window/render.c | 8 ++++---- src/window/render.h | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/game/game.c b/src/game/game.c index 231cba7..a5ed63c 100644 --- a/src/game/game.c +++ b/src/game/game.c @@ -2,16 +2,16 @@ #include "gametime.h" -void game_init(game_data* dat) { - *dat = (game_data){ +void game_init(gamedata* dat) { + *dat = (gamedata){ gametime_new(), }; } -void game_update(game_data* dat) { +void game_update(gamedata* dat) { gametime_update(&dat->time); } -void game_free(game_data* dat) { +void game_free(gamedata* dat) { (void)dat; } diff --git a/src/game/game.h b/src/game/game.h index 59662d0..c9ee222 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -5,8 +5,8 @@ typedef struct { gametime time; -} game_data; +} gamedata; -void game_init(game_data*); // initializes everything needed to start the game; outputs to game_data -void game_update(game_data*); // causes an update to occur within the game -void game_free(game_data*); // frees the resources associated with the game +void game_init(gamedata*); // initializes everything needed to start the game; outputs to game_data +void game_update(gamedata*); // causes an update to occur within the game +void game_free(gamedata*); // frees the resources associated with the game diff --git a/src/main.c b/src/main.c index c043e2a..b9dc9ee 100644 --- a/src/main.c +++ b/src/main.c @@ -8,8 +8,8 @@ #include "game/game.h" #include "window/render.h" -static game_data gdat; // initialized in init(), reading beforehand is undefined behaviour -static render_data rdat; // initialized in init(), reading beforehand is undefined behaviour +static gamedata gdat; // initialized in init(), reading beforehand is undefined behaviour +static renderdata rdat; // initialized in init(), reading beforehand is undefined behaviour // initialize the game static void init(void) { diff --git a/src/window/render.c b/src/window/render.c index 20f97c8..59c4c82 100644 --- a/src/window/render.c +++ b/src/window/render.c @@ -11,7 +11,7 @@ #include "../game/game.h" #include "colour/colour32.h" -void render_init(render_data* const rdat, game_data const* const gdat) { +void render_init(renderdata* const rdat, gamedata const* const gdat) { SDL_Window* const window = SDL_CreateWindow(NULL, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 100, 100, SDL_WINDOW_SHOWN); if (window == NULL) error(ERROR_SDL_RENDERING_INIT, "failed to create a window. SDL Error: %s", SDL_GetError()); @@ -21,14 +21,14 @@ void render_init(render_data* const rdat, game_data const* const gdat) { if (renderer == NULL) error(ERROR_SDL_RENDERING_INIT, "failed to create a renderer. SDL Error: %s", SDL_GetError()); - *rdat = (render_data){ + *rdat = (renderdata){ window, renderer, gdat, }; } -void render_update(render_data const* const rdat) { +void render_update(renderdata const* const rdat) { set_colour32(rdat->renderer, COLOUR32_BLACK); SDL_RenderClear(rdat->renderer); @@ -36,7 +36,7 @@ void render_update(render_data const* const rdat) { SDL_RenderPresent(rdat->renderer); } -void render_free(render_data* const rdat) { +void render_free(renderdata* const rdat) { (void)rdat; error(STATUS_ERROR, "function render_free(render_data*) not implemented"); } diff --git a/src/window/render.h b/src/window/render.h index fb995c1..ad6232c 100644 --- a/src/window/render.h +++ b/src/window/render.h @@ -9,9 +9,9 @@ typedef struct { SDL_Window* window; SDL_Renderer* renderer; - game_data const* gdat; -} render_data; + gamedata const* gdat; +} renderdata; -void render_init(render_data*, game_data const*); // initializes the renderer, outputs to render_data -void render_update(render_data const*); // causes a draw to occur, will also determine update rate -void render_free(render_data*); // frees the memory allocated to the renderer in render_data +void render_init(renderdata*, gamedata const*); // initializes the renderer, outputs to render_data +void render_update(renderdata const*); // causes a draw to occur, will also determine update rate +void render_free(renderdata*); // frees the memory allocated to the renderer in render_data