From 55643a3d59a45f9a79a44903d099d7335f003fb9 Mon Sep 17 00:00:00 2001 From: Theo Champion Date: Fri, 3 Oct 2025 18:21:48 +0200 Subject: [PATCH] norme: Fixed norme issue for the sprite interaction --- Makefile | 1 + src/sprites/sprite_caster.c | 16 +++------------- src/sprites/sprite_interactions.c | 30 ++++++++++++++++++++++++++++++ src/sprites/sprite_interactions.h | 20 ++++++++++++++++++++ 4 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 src/sprites/sprite_interactions.c create mode 100644 src/sprites/sprite_interactions.h diff --git a/Makefile b/Makefile index 3a40c04..8e29850 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,7 @@ SOURCEFILES = \ src/sprites/create_sprite.c \ src/sprites/move_sprites.c \ src/sprites/sort_sprites.c \ + src/sprites/sprite_interactions.c \ src/sprites/sprite_caster.c \ OBJECTS = $(SOURCEFILES:.c=.o) diff --git a/src/sprites/sprite_caster.c b/src/sprites/sprite_caster.c index dcbe37d..d327842 100644 --- a/src/sprites/sprite_caster.c +++ b/src/sprites/sprite_caster.c @@ -6,13 +6,14 @@ /* By: tchampio +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/08/05 15:51:01 by tchampio #+# #+# */ -/* Updated: 2025/09/15 15:41:09 by tchampio ### ########.fr */ +/* Updated: 2025/10/03 18:20:05 by tchampio ### ########.fr */ /* */ /* ************************************************************************** */ #include "../cub3d_data.h" #include "../draw/drawutils.h" #include "../renderer/render.h" +#include "sprite_interactions.h" #include "sort_sprites.h" #include #include "../../libft/includes/libft.h" @@ -113,18 +114,7 @@ void sprite_caster(t_cub3d_data *data) if (!data->sprite_list || !data->sprite_list[0]) return ; sort_sprites(data->sprite_order, data->sprite_distances, data); - if (data->sprite_distances[data->sprite_counter - 1] <= 1.5) - { - if (data->sprite_list[data->sprite_order[data->sprite_counter - 1]] - ->sprite_type == PERK) - { - if (data->keypresses.is_f_pressed) - { - data->keypresses.is_f_pressed = false; - ft_printf("🎵You need a little revive🎵\n"); - } - } - } + handle_sprite_interactions(data); i = 0; while (data->sprite_list[i] && i < MAX_SPRITES) { diff --git a/src/sprites/sprite_interactions.c b/src/sprites/sprite_interactions.c new file mode 100644 index 0000000..27b4d19 --- /dev/null +++ b/src/sprites/sprite_interactions.c @@ -0,0 +1,30 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* sprite_interactions.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tchampio +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/10/03 18:18:04 by tchampio #+# #+# */ +/* Updated: 2025/10/03 18:19:03 by tchampio ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "../cub3d_data.h" +#include "../../libft/includes/libft.h" + +void handle_sprite_interactions(t_cub3d_data *data) +{ + if (data->sprite_distances[data->sprite_counter - 1] <= 1.5) + { + if (data->sprite_list[data->sprite_order[data->sprite_counter - 1]] + ->sprite_type == PERK) + { + if (data->keypresses.is_f_pressed) + { + data->keypresses.is_f_pressed = false; + ft_printf("🎵You need a little revive🎵\n"); + } + } + } +} diff --git a/src/sprites/sprite_interactions.h b/src/sprites/sprite_interactions.h new file mode 100644 index 0000000..1fc9328 --- /dev/null +++ b/src/sprites/sprite_interactions.h @@ -0,0 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* sprite_interactions.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tchampio +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/10/03 18:19:22 by tchampio #+# #+# */ +/* Updated: 2025/10/03 18:21:00 by tchampio ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef SPRITE_INTERACTIONS_H +# define SPRITE_INTERACTIONS_H + +# include "../cub3d_data.h" + +void handle_sprite_interactions(t_cub3d_data *data); + +#endif