Norme norme

6 files changed, 17 insertions, 48 deletions

diff --git a/src/ft_check_missing_sfx.c b/src/ft_check_missing_sfx.c
index 0d4411a..7790d95 100644
--- a/src/ft_check_missing_sfx.c
+++ b/src/ft_check_missing_sfx.c
@@ -32,25 +32,25 @@ static int
 	ft_check_missing_weapon_sfx(t_cub *clist)
 {
 	if (ft_check_not_found(FT_SFX_W_ONE_LOAD_PATH) < 0 ||
-		ft_check_ext(FT_SFX_W_ONE_LOAD_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_W_ONE_LOAD_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_W_ONE_LOAD, clist));
 	if (ft_check_not_found(FT_SFX_W_ONE_FIRE_PATH) < 0 ||
-		ft_check_ext(FT_SFX_W_ONE_FIRE_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_W_ONE_FIRE_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_W_ONE_FIRE, clist));
 	if (ft_check_not_found(FT_SFX_W_TWO_LOAD_PATH) < 0 ||
-		ft_check_ext(FT_SFX_W_TWO_LOAD_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_W_TWO_LOAD_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_W_TWO_LOAD, clist));
 	if (ft_check_not_found(FT_SFX_W_TWO_FIRE_PATH) < 0 ||
-		ft_check_ext(FT_SFX_W_TWO_FIRE_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_W_TWO_FIRE_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_W_TWO_FIRE, clist));
 	if (ft_check_not_found(FT_SFX_W_THREE_LOAD_PATH) < 0 ||
-		ft_check_ext(FT_SFX_W_THREE_LOAD_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_W_THREE_LOAD_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_W_THREE_LOAD, clist));
 	if (ft_check_not_found(FT_SFX_W_THREE_FIRE_PATH) < 0 ||
-		ft_check_ext(FT_SFX_W_THREE_FIRE_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_W_THREE_FIRE_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_W_THREE_FIRE, clist));
 	if (ft_check_not_found(FT_SFX_OOA_PATH) < 0 ||
-		ft_check_ext(FT_SFX_OOA_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_OOA_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_OOA, clist));
 	return (ft_check_missing_enemy_sfx(clist));
 }
@@ -59,22 +59,22 @@ int
 	ft_check_missing_sfx(t_cub *clist)
 {
 	if (ft_check_not_found(FT_SFX_DEATH_PATH) < 0 ||
-		ft_check_ext(FT_SFX_DEATH_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_DEATH_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_DEATH, clist));
 	if (ft_check_not_found(FT_SFX_N_LVL_PATH) < 0 ||
-		ft_check_ext(FT_SFX_N_LVL_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_N_LVL_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_N_LVL, clist));
 	if (ft_check_not_found(FT_SFX_SCR_ONE_PATH) < 0 ||
-		ft_check_ext(FT_SFX_SCR_ONE_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_SCR_ONE_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_SCR_ONE, clist));
 	if (ft_check_not_found(FT_SFX_SCR_TWO_PATH) < 0 ||
-		ft_check_ext(FT_SFX_SCR_TWO_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_SCR_TWO_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_SCR_TWO, clist));
 	if (ft_check_not_found(FT_SFX_TRAP_PATH) < 0 ||
-		ft_check_ext(FT_SFX_TRAP_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_TRAP_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_TRAP, clist));
 	if (ft_check_not_found(FT_SFX_HEAL_PATH) < 0 ||
-		ft_check_ext(FT_SFX_HEAL_PATH, ".wav") < 0) 
+		ft_check_ext(FT_SFX_HEAL_PATH, ".wav") < 0)
 		return (ft_missing_error(FT_ERR_MISS_SFX_HEAL, clist));
 	return (ft_check_missing_weapon_sfx(clist));
 }
diff --git a/src/ft_draw_ammo_caption.c b/src/ft_draw_ammo_caption.c
index 4f8bd55..8c8ec2c 100644
--- a/src/ft_draw_ammo_caption.c
+++ b/src/ft_draw_ammo_caption.c
@@ -65,8 +65,8 @@ static void
 static void
 	ft_get_hw(t_cub *cl)
 {
-	int16_t		x;
-	int16_t		y;
+	int16_t			x;
+	int16_t			y;
 	const int16_t	scl = cl->mlist.scale;
 
 	x = 20;
diff --git a/src/ft_draw_health_caption.c b/src/ft_draw_health_caption.c
index b2cb675..879fc44 100644
--- a/src/ft_draw_health_caption.c
+++ b/src/ft_draw_health_caption.c
@@ -34,7 +34,7 @@ static void
 		(uint8_t)cl->tlist[21].ptr[cl->tlist[21].tex_x * 4 + 4 *
 		cl->tlist[21].img_w * cl->tlist[21].tex_y + 2];
 }
-	
+
 static void
 	ft_put_health_caption(t_cub *cl)
 {
diff --git a/src/ft_floor_cast_inits.c b/src/ft_floor_cast_inits.c
index 022be1b..74b76c6 100644
--- a/src/ft_floor_cast_inits.c
+++ b/src/ft_floor_cast_inits.c
@@ -13,7 +13,6 @@
 #include <cub3d.h>
 #include <stdint.h>
 
-#include <libft.h>
 void
 	ft_set_fc_tex_xy(uint8_t tid, uint16_t x, uint16_t y, t_cub *cl)
 {
diff --git a/src/ft_get_sprite_spawns.c b/src/ft_get_sprite_spawns.c
index a573593..239a70b 100644
--- a/src/ft_get_sprite_spawns.c
+++ b/src/ft_get_sprite_spawns.c
@@ -54,7 +54,7 @@ static void
 	else if (s_n == 13 && cl->mlist.sprite_nbr[s_n] > 32)
 		ft_map_error(FT_ERR_TOO_MUCH_ENMY, cl);
 }
-	
+
 static int8_t
 	ft_other_next_sprite(t_cub *cl, int s_n)
 {
diff --git a/src/ft_get_traps.c b/src/ft_get_traps.c
index db0699c..410ba55 100644
--- a/src/ft_get_traps.c
+++ b/src/ft_get_traps.c
@@ -14,36 +14,6 @@
 #include <cub3d.h>
 #include <stdint.h>
 
-/* void */
-/* 	ft_get_trap_spawn(t_cub *clist) */
-/* { */
-/* 	size_t	x; */
-/* 	size_t	y; */
-/* 	uint16_t i; */
-
-/* 	x = 1; */
-/* 	y = 1; */
-/* 	i = 0; */
-/* 	while (clist->mlist.map[y]) */
-/* 	{ */
-/* 		while (clist->mlist.map[y][x]) */
-/* 		{ */
-/* 			if (clist->mlist.map[y][x] == 'T') */
-/* 			{ */
-/* 				clist->mlist.traps_nbr++; */
-/* 				if (clist->mlist.traps_nbr > 512) */
-/* 					ft_map_error(FT_ERR_TOO_MUCH_TRAPS, clist); */
-/* 				clist->traps[i].s_pos_x = x; */
-/* 				clist->traps[i].s_pos_y = y; */
-/* 				i++; */
-/* 			} */
-/* 			x++; */
-/* 		} */
-/* 		x = 1; */
-/* 		y++; */
-/* 	} */
-/* } */
-
 int8_t
 	ft_get_traps(char **words, t_cub *clist)
 {