From 850ddb299aac0f09a0a7e5a8732f6c6221a3d6d8 Mon Sep 17 00:00:00 2001 From: kinou-p Date: Wed, 4 May 2022 21:18:43 +0200 Subject: [PATCH] fix mini leak --- srcs/cast_ray.c | 17 +++++++++-------- srcs/utils.c | 3 ++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/srcs/cast_ray.c b/srcs/cast_ray.c index bfddf66..fc64646 100644 --- a/srcs/cast_ray.c +++ b/srcs/cast_ray.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/05/04 18:08:14 by apommier #+# #+# */ -/* Updated: 2022/05/04 20:55:52 by apommier ### ########.fr */ +/* Updated: 2022/05/04 21:06:34 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,9 +30,9 @@ void draw_ray(t_data *img) float ray_x = 0; //where ray touch y float next_x = 0; float next_y = 0; - float dist_v = 1000000000; - float dist_h = 1000000000; - float dist_f = 0; + float dist_v; + float dist_h; + float dist_f; float vx = 0; float vy = 0; int count = 0; @@ -42,9 +42,8 @@ void draw_ray(t_data *img) int mx = 0; int mp = 0; - + (void)dist_f; //printf("\nENTER DRAW RAY\n"); - int k = -1; //while (++k < ft_strlen(img->map.simple_map)) // printf("%d--- %c\n", k, img->map.simple_map[k]); //printf("map = -%s-\n", img->map.simple_map); @@ -161,16 +160,18 @@ void draw_ray(t_data *img) vx = cos(deg_to_rad(ray_angle)); vy = -sin(deg_to_rad(ray_angle)); //printf("player.vx= %f vx= %f player.vy= %f vy= %f\n", img->player.vx, vx, img->player.vy, vy); - if ((dist_h != -1 || dist_v != -1) && dist_h < dist_v && dist_h > 0) + if (dist_h != -1 && (dist_h < dist_v || dist_v == -1)) { print_ray2(img, vx, vy, fabs(dist_h)); dist_f = dist_h; } - else if (dist_h != -1 || dist_v != -1) + else if (dist_v != -1) { dist_f = dist_v; print_ray2(img, vx, vy, fabs(dist_v)); } + else + dist_f = 0; ray_angle = reset_angle(ray_angle - 1); } } \ No newline at end of file diff --git a/srcs/utils.c b/srcs/utils.c index 455faea..c6db274 100644 --- a/srcs/utils.c +++ b/srcs/utils.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 23:37:02 by apommier #+# #+# */ -/* Updated: 2022/05/04 18:07:18 by apommier ### ########.fr */ +/* Updated: 2022/05/04 21:17:30 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,6 +18,7 @@ int quit_game(t_data *img) mlx_destroy_display(img->mlx); if (img->mlx) free(img->mlx); + free(img->map.simple_map); //free_double(img->map); exit(0); }