thepigeongenerator/tetris_clone
1
0
Fork 0
mirror of https://github.com/thepigeongenerator/tetris_clone.git synced 2025-12-17 05:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: forgot to rename renderdata to a lowercase variant

Browse Source
This commit is contained in:
Quinn
2025-02-12 17:29:34 +01:00
parent be3c796ec1
commit 0596f8d5d5
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@@ -23,7 +23,7 @@
bool playing = true; bool playing = true;
RenderData render_dat = {0}; render_data render_dat = {0};
game_data game_dat = {0}; game_data game_dat = {0};

13
src/window/renderer.c
View File

@@ -19,7 +19,7 @@
#define COLOUR_SCORE COLOUR_YELLOW #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); 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()); 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()); if (font == NULL) error(ERROR_SDL_FONT_INIT, "Failed to open font! TTF Error: %s", TTF_GetError());
// initialize the render data // initialize the render data
*render_dat = (RenderData){ *render_dat = (render_data){
game_dat, game_dat,
window, window,
renderer, renderer,
font}; font,
};
} }
static inline int32_t get_column_pos(uint8_t column) { 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_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_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); SDL_RenderCopy(renderer, txt_texture, NULL, &text_rect);
// free data // 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; SDL_Renderer* const renderer = dat->renderer;
game_data const* const game_data = dat->game_dat; game_data const* const game_data = dat->game_dat;
@@ -134,7 +135,7 @@ void renderer_update(RenderData const* const dat) {
SDL_RenderPresent(renderer); SDL_RenderPresent(renderer);
} }
void renderer_free(RenderData* const render_data) { void renderer_free(render_data* const render_data) {
SDL_DestroyRenderer(render_data->renderer); SDL_DestroyRenderer(render_data->renderer);
SDL_DestroyWindow(render_data->window); SDL_DestroyWindow(render_data->window);
TTF_CloseFont(render_data->font); TTF_CloseFont(render_data->font);

8
src/window/renderer.h
View File

@@ -20,8 +20,8 @@ typedef struct {
SDL_Window* window; SDL_Window* window;
SDL_Renderer* renderer; SDL_Renderer* renderer;
TTF_Font* font; TTF_Font* font;
} RenderData; } render_data;
void renderer_init(RenderData* render_dat, game_data const* game_dat); void renderer_init(render_data* render_dat, game_data const* game_dat);
void renderer_update(RenderData const* dat); void renderer_update(render_data const* dat);
void renderer_free(RenderData* dat); void renderer_free(render_data* dat);