From 0596f8d5d5785cb83a9a65822ff5dd8799c03646 Mon Sep 17 00:00:00 2001 From: Quinn Date: Wed, 12 Feb 2025 17:29:34 +0100 Subject: [PATCH] fix: forgot to rename renderdata to a lowercase variant --- src/main.c | 2 +- src/window/renderer.c | 13 +++++++------ src/window/renderer.h | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main.c b/src/main.c index 450008a..768f48d 100644 --- a/src/main.c +++ b/src/main.c @@ -23,7 +23,7 @@ bool playing = true; -RenderData render_dat = {0}; +render_data render_dat = {0}; game_data game_dat = {0}; diff --git a/src/window/renderer.c b/src/window/renderer.c index 92de3cf..4d1720f 100644 --- a/src/window/renderer.c +++ b/src/window/renderer.c @@ -19,7 +19,7 @@ #define COLOUR_SCORE COLOUR_YELLOW -void renderer_init(RenderData* const render_dat, game_data const* const game_dat) { +void renderer_init(render_data* const render_dat, game_data const* const game_dat) { SDL_Window* const window = SDL_CreateWindow("tetris clone", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN); if (window == NULL) error(ERROR_SDL_RENDERER_INIT, "Window failed to be created! SDL Error: %s", SDL_GetError()); @@ -30,11 +30,12 @@ void renderer_init(RenderData* const render_dat, game_data const* const game_dat if (font == NULL) error(ERROR_SDL_FONT_INIT, "Failed to open font! TTF Error: %s", TTF_GetError()); // initialize the render data - *render_dat = (RenderData){ + *render_dat = (render_data){ game_dat, window, renderer, - font}; + font, + }; } static inline int32_t get_column_pos(uint8_t column) { @@ -54,7 +55,7 @@ static void draw_score_text(SDL_Renderer* const renderer, TTF_Font* const font, SDL_Surface* const txt_surface = TTF_RenderText_Solid(font, score_text, (SDL_Colour){colour8_red32(COLOUR_SCORE), colour8_green32(COLOUR_SCORE), colour8_blue32(COLOUR_SCORE), 0xFF}); SDL_Texture* const txt_texture = SDL_CreateTextureFromSurface(renderer, txt_surface); -SDL_Rect text_rect = {get_column_pos(COLUMNS + 1), get_row_pos(0), txt_surface->w, txt_surface->h}; + SDL_Rect text_rect = {get_column_pos(COLUMNS + 1), get_row_pos(0), txt_surface->w, txt_surface->h}; SDL_RenderCopy(renderer, txt_texture, NULL, &text_rect); // free data @@ -104,7 +105,7 @@ static void render_level(SDL_Renderer* const renderer, game_data const* const da } } -void renderer_update(RenderData const* const dat) { +void renderer_update(render_data const* const dat) { SDL_Renderer* const renderer = dat->renderer; game_data const* const game_data = dat->game_dat; @@ -134,7 +135,7 @@ void renderer_update(RenderData const* const dat) { SDL_RenderPresent(renderer); } -void renderer_free(RenderData* const render_data) { +void renderer_free(render_data* const render_data) { SDL_DestroyRenderer(render_data->renderer); SDL_DestroyWindow(render_data->window); TTF_CloseFont(render_data->font); diff --git a/src/window/renderer.h b/src/window/renderer.h index 27879c8..8096480 100644 --- a/src/window/renderer.h +++ b/src/window/renderer.h @@ -20,8 +20,8 @@ typedef struct { SDL_Window* window; SDL_Renderer* renderer; TTF_Font* font; -} RenderData; +} render_data; -void renderer_init(RenderData* render_dat, game_data const* game_dat); -void renderer_update(RenderData const* dat); -void renderer_free(RenderData* dat); +void renderer_init(render_data* render_dat, game_data const* game_dat); +void renderer_update(render_data const* dat); +void renderer_free(render_data* dat);