1 files changed, 5 insertions, 62 deletions

diff --git a/src/ft_draw_hud.c b/src/ft_draw_hud.c
index 5feab32..a10b2f3 100644
--- a/src/ft_draw_hud.c
+++ b/src/ft_draw_hud.c
@@ -14,66 +14,6 @@
 #include <stdint.h>
 
 static void
-	ft_put_image_back_to_ptr(uint16_t y, uint16_t x, t_cub *cl)
-{
-	const uint32_t	col = 0x00d2d4d6;
-
-	*(cl->img.ptr + x * 4 + (cl->img.sizeline * y)) =
-		(uint8_t)*(cl->tlist[16].ptr + cl->tlist[16].tex_x * 4 + 4 *
-		cl->tlist[16].img_w * cl->tlist[16].tex_y) & col;
-	*(cl->img.ptr + x * 4 + (cl->img.sizeline * y) + 1) =
-		(uint8_t)*(cl->tlist[16].ptr + cl->tlist[16].tex_x * 4 + 4 *
-		cl->tlist[16].img_w * cl->tlist[16].tex_y + 1) & col;
-	*(cl->img.ptr + x * 4 + (cl->img.sizeline * y) + 2) =
-		(uint8_t)*(cl->tlist[16].ptr + cl->tlist[16].tex_x * 4 + 4 *
-		cl->tlist[16].img_w * cl->tlist[16].tex_y + 2) & col;
-}
-
-static void
-	ft_draw_minimap_back_image(uint16_t h, uint16_t w, t_cub *cl)
-{
-	int32_t	x_ratio;
-	int32_t	y_ratio;
-	int16_t	x;
-	int16_t	y;
-
-	x_ratio = (int)((cl->tlist[16].img_w << 16) / w) + 1;
-	y_ratio = (int)((cl->tlist[16].img_h << 16) / h) + 1;
-	y = cl->wlist.y_size - (cl->mlist.map_h * cl->mlist.scale) - 20;
-	while (y < (int32_t)cl->wlist.y_size)
-	{
-		x = 0;
-		cl->tlist[16].tex_y = (y * y_ratio) >> 16;
-		while (x < (uint16_t)((cl->mlist.map_w
-			* cl->mlist.scale) + 20 + (32 * cl->mlist.scale)))
-		{
-			cl->tlist[16].tex_x = (x * x_ratio) >> 16;
-			ft_put_image_back_to_ptr(y, x, cl);
-			x++;
-		}
-		y++;
-	}
-}
-
-static void
-	ft_draw_minimap_back(size_t map_h, size_t map_w, t_win *wl, t_cub *cl)
-{
-	const uint16_t	scl = cl->mlist.scale;
-	uint16_t		x;
-	uint16_t		y;
-
-	x = 0;
-	y = wl->y_size - (map_h * scl) - 20;
-	while (x < (map_w * scl) + 20 + (32 * scl))
-	{
-		while (y < wl->y_size)
-			y++;
-		x++;
-	}
-	ft_draw_minimap_back_image(y, x, cl);
-}
-
-static void
 	ft_draw_stage_back(t_cub *clist)
 {
 	float			x;
@@ -104,10 +44,13 @@ static void
 int8_t
 	ft_draw_hud(t_cub *clist)
 {
-	ft_draw_minimap_back(clist->mlist.map_h,
-		clist->mlist.map_w, &clist->wlist, clist);
+	ft_draw_ammo_back(clist);
+	ft_draw_minimap_back(clist);
 	ft_draw_map(clist->mlist.map, clist);
 	ft_draw_life_bar(clist);
+	ft_draw_ammo_bar(clist);
+	ft_draw_health_caption(clist);
+	ft_draw_ammo_caption(clist);
 	if (clist->mlist.isnlvl)
 	{
 		ft_draw_stage_back(clist);