Good start

5 files changed, 196 insertions, 7 deletions

diff --git a/src/ft_draw_ammo_back.c b/src/ft_draw_ammo_back.c
new file mode 100644
index 0000000..81fd92f
--- /dev/null
+++ b/src/ft_draw_ammo_back.c
@@ -0,0 +1,90 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_draw_ammo_back.c                                :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: rbousset <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/02/22 20:02:47 by rbousset          #+#    #+#             */
+/*   Updated: 2020/02/22 20:02:48 by rbousset         ###   ########lyon.fr   */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include <cub3d.h>
+#include <stdint.h>
+
+static void
+	ft_draw_back(uint16_t y, uint16_t x, t_cub *cl)
+{
+	const uint16_t	scl = cl->mlist.scale;
+
+	cl->img.ptr[x * 4 +
+				(cl->img.sizeline * (y + cl->wlist.y_size -
+		(2 * ((cl->mlist.map_h * scl) - 20))))] =
+		(uint8_t)cl->tlist[16].ptr[cl->tlist[16].tex_x * 4 + 4 *
+		cl->tlist[16].img_w * cl->tlist[16].tex_y];
+	cl->img.ptr[x * 4 +
+		(cl->img.sizeline * (y + cl->wlist.y_size -
+		(2 * ((cl->mlist.map_h * scl) - 20)))) + 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];
+	cl->img.ptr[x * 4 +
+		(cl->img.sizeline * (y + cl->wlist.y_size -
+		(2 * ((cl->mlist.map_h * scl) - 20)))) + 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];
+}
+
+static void
+	ft_put_ammo_back(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) / cl->amm_back_w) + 1;
+	y_ratio = (int)(((cl->tlist[16].img_h) << 16) / cl->amm_back_h) + 1;
+	y = 0;
+	while (y < cl->amm_back_h)
+	{
+		cl->tlist[16].tex_y = ((y * y_ratio) >> 16);
+		x = 0;
+		while (x < cl->amm_back_w)
+		{
+			cl->tlist[16].tex_x = ((x * x_ratio) >> 16);
+			ft_draw_back(y, x, cl);
+			x++;
+		}
+		y++;
+	}
+}
+
+static void
+	ft_get_hw(t_cub *cl)
+{
+	uint16_t		x;
+	uint16_t		y;
+	const uint16_t	scl = cl->mlist.scale;
+
+	x = 0;
+	y = cl->wlist.y_size - (2 * ((cl->mlist.map_h * scl) - 20));
+	while (x < (cl->mlist.map_w * scl) + 20)
+	{
+		while (y < cl->wlist.y_size - (cl->mlist.map_h * scl) - 20)
+			y++;
+		x++;
+	}
+	y -= cl->wlist.y_size - (2 * ((cl->mlist.map_h * scl) - 20));
+	y = (y <= 0) ? (1) : (y);
+	x = (x <= 0) ? (1) : (x);
+	cl->amm_back_h = y;
+	cl->amm_back_w = x;
+}
+
+void
+	ft_draw_ammo_back(t_cub *cl)
+{
+	ft_get_hw(cl);
+	ft_put_ammo_back(cl);
+}
diff --git a/src/ft_draw_ammo_caption.c b/src/ft_draw_ammo_caption.c
new file mode 100644
index 0000000..9231478
--- /dev/null
+++ b/src/ft_draw_ammo_caption.c
@@ -0,0 +1,95 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_draw_ammo_caption.c                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: rbousset <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/02/22 20:02:47 by rbousset          #+#    #+#             */
+/*   Updated: 2020/02/22 20:02:48 by rbousset         ###   ########lyon.fr   */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include <cub3d.h>
+#include <stdint.h>
+
+static void
+	ft_draw_caption(uint16_t y, uint16_t x, t_cub *cl)
+{
+	const int16_t	scl = cl->mlist.scale;
+
+	cl->img.ptr[(x + 20) * 4 +
+		(cl->img.sizeline * (y + cl->wlist.y_size -
+		(2 * ((cl->mlist.map_h * scl) - 20) - 10)))] =
+		(uint8_t)cl->tlist[22].ptr[cl->tlist[22].tex_x * 4 + 4 *
+		cl->tlist[22].img_w * cl->tlist[22].tex_y];
+	cl->img.ptr[(x + 20) * 4 +
+		(cl->img.sizeline * (y + cl->wlist.y_size -
+		(2 * ((cl->mlist.map_h * scl) - 20) - 10))) + 1] =
+		(uint8_t)cl->tlist[22].ptr[cl->tlist[22].tex_x * 4 + 4 *
+		cl->tlist[22].img_w * cl->tlist[22].tex_y + 1];
+	cl->img.ptr[(x + 20) * 4 +
+		(cl->img.sizeline * (y + cl->wlist.y_size -
+		(2 * ((cl->mlist.map_h * scl) - 20) - 10))) + 2] =
+		(uint8_t)cl->tlist[22].ptr[cl->tlist[22].tex_x * 4 + 4 *
+		cl->tlist[22].img_w * cl->tlist[22].tex_y + 2];
+}
+	
+static void
+	ft_put_ammo_caption(t_cub *cl)
+{
+	int32_t	x_ratio;
+	int32_t	y_ratio;
+	int16_t	x;
+	int16_t	y;
+
+	x_ratio = (int)(((cl->tlist[22].img_w) << 16) / cl->ammo_cap_w) + 1;
+	y_ratio = (int)(((cl->tlist[22].img_h) << 16) / cl->ammo_cap_h) + 1;
+	y = 0;
+	while (y < cl->ammo_cap_h)
+	{
+		cl->tlist[22].tex_y = ((y * y_ratio) >> 16);
+		x = 0;
+		while (x < cl->ammo_cap_w)
+		{
+			cl->tlist[22].tex_x = ((x * x_ratio) >> 16);
+			if (cl->tlist[22].ptr[cl->tlist[22].tex_x * 4 + 4 *
+				cl->tlist[22].img_h * cl->tlist[22].tex_y])
+				ft_draw_caption(y, x, cl);
+			x++;
+		}
+		y++;
+	}
+}
+
+static void
+	ft_get_hw(t_cub *cl)
+{
+	int16_t			x;
+	int16_t			y;
+	const int16_t	scl = cl->mlist.scale;
+
+	x = 20;
+	y = cl->wlist.y_size - (2 * ((cl->mlist.map_h * scl) - 20) - 10);
+	while (y < (int16_t)((cl->wlist.y_size - 10)
+		- (2 * ((cl->mlist.map_h * scl) / 1.3)) - 10))
+	{
+		x = 20;
+		while (x < (int16_t)((cl->mlist.map_w * scl) + 5))
+			x++;
+		y++;
+	}
+	y -= cl->wlist.y_size - (2 * ((cl->mlist.map_h * scl) - 20) - 10);
+	x -= 20;
+	y = (y <= 0) ? (1) : (y);
+	x = (x <= 0) ? (1) : (x);
+	cl->ammo_cap_h = y;
+	cl->ammo_cap_w = x;
+}
+
+void
+	ft_draw_ammo_caption(t_cub *cl)
+{
+	ft_get_hw(cl);
+	ft_put_ammo_caption(cl);
+}
diff --git a/src/ft_draw_hud.c b/src/ft_draw_hud.c
index ff87f37..1074e3b 100644
--- a/src/ft_draw_hud.c
+++ b/src/ft_draw_hud.c
@@ -44,11 +44,12 @@ static void
 int8_t
 	ft_draw_hud(t_cub *clist)
 {
+	ft_draw_ammo_back(clist);
 	ft_draw_minimap_back(clist);
 	ft_draw_map(clist->mlist.map, clist);
-	/* ft_draw_ammo_back(clist->mlist.map, clist); */
 	ft_draw_life_bar(clist);
 	ft_draw_health_caption(clist);
+	ft_draw_ammo_caption(clist);
 	if (clist->mlist.isnlvl)
 	{
 		ft_draw_stage_back(clist);
diff --git a/src/ft_draw_map_back.c b/src/ft_draw_map_back.c
index 3026687..4945b3d 100644
--- a/src/ft_draw_map_back.c
+++ b/src/ft_draw_map_back.c
@@ -16,24 +16,23 @@
 static void
 	ft_draw_back(uint16_t y, uint16_t x, t_cub *cl)
 {
-	const uint32_t	col = 0x00d2d4d6;
 	const uint16_t	scl = cl->mlist.scale;
 
 	cl->img.ptr[x * 4 +
-		(cl->img.sizeline * (y + cl->wlist.y_size- (cl->mlist.map_h * scl)
+		(cl->img.sizeline * (y + cl->wlist.y_size - (cl->mlist.map_h * scl)
 		- 20))] =
 		(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->tlist[16].img_w * cl->tlist[16].tex_y];
 	cl->img.ptr[x * 4 +
 		(cl->img.sizeline * (y + cl->wlist.y_size - (cl->mlist.map_h * scl)
 		- 20)) + 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->tlist[16].img_w * cl->tlist[16].tex_y + 1];
 	cl->img.ptr[x * 4 +
 		(cl->img.sizeline * (y + cl->wlist.y_size - (cl->mlist.map_h * scl)
 		- 20)) + 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;
+		cl->tlist[16].img_w * cl->tlist[16].tex_y + 2];
 }
 
 static void
@@ -70,7 +69,7 @@ static void
 
 	x = 0;
 	y = cl->wlist.y_size - (cl->mlist.map_h * scl) - 20;
-	while (x < (cl->mlist.map_w * scl) + 20 + (32 * scl))
+	while (x < (cl->mlist.map_w * scl) + 20 + (24 * scl))
 	{
 		while (y < cl->wlist.y_size)
 			y++;
diff --git a/src/ft_init_lists.c b/src/ft_init_lists.c
index d8c653f..942b9a4 100644
--- a/src/ft_init_lists.c
+++ b/src/ft_init_lists.c
@@ -126,5 +126,9 @@ int8_t
 	clist->life_cap_w = 0;
 	clist->map_back_h = 0;
 	clist->map_back_w = 0;
+	clist->amm_back_h = 0;
+	clist->amm_back_w = 0;
+	clist->ammo_cap_h = 0;
+	clist->ammo_cap_w = 0;
 	return (0);
 }