From a7fd88b60bc2643dd5f1a147ac937b10c36bc5c3 Mon Sep 17 00:00:00 2001 From: Quinten Mennen Date: Wed, 11 Jun 2025 14:54:24 +0200 Subject: [PATCH] mlx_delete_image is not necessary --- src/game/game.c | 45 ++++++++------------------------------------- src/menu/menu.c | 16 ++++------------ 2 files changed, 12 insertions(+), 49 deletions(-) diff --git a/src/game/game.c b/src/game/game.c index 5b219c2..4093a6a 100644 --- a/src/game/game.c +++ b/src/game/game.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* :::::::: */ -/* game.c :+: :+: */ -/* +:+ */ -/* By: qmennen +#+ */ -/* +#+ */ -/* Created: 2025/04/15 15:46:08 by qmennen #+# #+# */ -/* Updated: 2025/06/10 20:22:34 by whaffman ######## odam.nl */ +/* ::: :::::::: */ +/* game.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: qmennen +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/04/15 15:46:08 by qmennen #+# #+# */ +/* Updated: 2025/06/11 14:49:08 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -65,41 +65,12 @@ void game_run(t_game *game) game_over(game->manager); } -static void free_scoreboard(mlx_t *mlx, t_scoreboard *scoreboard) -{ - int i; - - if (!scoreboard) - return ; - i = 0; - while (i < 5) - { - if (scoreboard->texts[i]) - { - mlx_delete_image(mlx, scoreboard->texts[i]); - scoreboard->texts[i] = NULL; - } - i++; - } - free(scoreboard); -} - void game_free(t_game *game) { - if (game->scoreboard && game->screen && game->screen->mlx) - free_scoreboard(game->screen->mlx, game->scoreboard); - else if (game->scoreboard) + if (game->scoreboard) free(game->scoreboard); if (game->screen) - { - if (game->screen->hud) - { - mlx_delete_image(game->screen->mlx, game->screen->hud); - game->screen->hud = NULL; - } - mlx_delete_image(game->screen->mlx, game->screen->img); free(game->screen); - } if (game->player) free(game->player); if (game->map) diff --git a/src/menu/menu.c b/src/menu/menu.c index cacc4a8..a0480fe 100644 --- a/src/menu/menu.c +++ b/src/menu/menu.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/27 14:31:53 by qmennen #+# #+# */ -/* Updated: 2025/06/10 14:28:28 by qmennen ### ########.fr */ +/* Updated: 2025/06/11 14:52:12 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -74,20 +74,12 @@ void menu_toggle(t_menu *menu) void menu_free(t_menu *menu, t_screen *screen) { int i; - + + (void)screen; i = 0; if (!menu) return ; - while (i < menu->num_options) - { - if (menu->items[i]->image) - mlx_delete_image(screen->mlx, menu->items[i]->image); + while ((i++) < menu->num_options) free(menu->items[i]); - i++; - } - if (menu->selector) - mlx_delete_image(screen->mlx, menu->selector); - if (menu->background) - mlx_delete_image(screen->mlx, menu->background); free(menu); }