Better code structure

1 files changed, 3 insertions, 47 deletions

diff --git a/src/ft_drawmap.c b/src/ft_draw_scene.c
index b8b4e2c..57cecd4 100644
--- a/src/ft_drawmap.c
+++ b/src/ft_draw_scene.c
@@ -16,52 +16,8 @@
 #include <mlx.h>
 #include <stdint.h>
 
-static void
-	ft_draw_core_map(char **map, t_cub *clist)
-{
-	const uint8_t	scale = clist->scale;
-	size_t			x;
-	size_t			y;
-
-	x = 0;
-	y = 0;
-	while (map[y])
-	{
-		while (map[y][x])
-		{
-			if (map[y][x] == '1')
-				ft_drawsquare(scale + (x * (scale)),
-								scale + (y * (scale)), 0x00aa99aa, clist);
-			else if (map[y][x] == '2')
-				ft_drawsquare(scale + (x * (scale)),
-								scale + (y * (scale)), 0x0033ccff, clist);
-			else
-				ft_drawsquare(scale + (x * (scale)),
-					scale + (y * (scale)),
-					ft_rgb_to_hex(clist->f_rgb), clist);
-			x++;
-		}
-		x = 0;
-		y++;
-	}
-}
-
-static void
-	ft_draw_player(t_player *plist, t_cub *clist)
-{
-	const float		x = plist->pos_x;
-	const float		y = plist->pos_y;
-	const uint16_t	scale = clist->scale;
-
-	ft_drawsquare(
-				scale + (x * (scale + 1)),
-				scale + (y * (scale + 1)),
-				0x009843fa,
-				clist);
-}
-
 void
-	ft_drawmap(t_cub *clist)
+	ft_draw_scene(t_cub *clist)
 {
 	mlx_clear_window(clist->wlist->wlx, clist->wlist->winptr);
 	clist->img.img = mlx_new_image(clist->wlist->wlx,
@@ -69,8 +25,8 @@ void
 	clist->img.ptr = mlx_get_data_addr(clist->img.img, &clist->img.bpp,
 						&clist->img.sizeline, &clist->img.endian);
 	ft_castray(clist);
-	ft_draw_core_map(clist->map, clist);
-	ft_draw_player(clist->plist, clist);
+	if (clist->minimap)
+		ft_draw_map(clist->map, clist);
 	mlx_put_image_to_window(clist->wlist->wlx,
 						clist->wlist->winptr, clist->img.img, 0, 0);
 	mlx_destroy_image(clist->wlist->wlx, clist->img.img);