Stuff to fix but ok

5 files changed, 143 insertions, 5 deletions

diff --git a/src/ft_draw_ammo_bar.c b/src/ft_draw_ammo_bar.c
new file mode 100644
index 0000000..8a73f68
--- /dev/null
+++ b/src/ft_draw_ammo_bar.c
@@ -0,0 +1,138 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_draw_ammo_bar.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 <libft.h>
+#include <cub3d.h>
+#include <stdint.h>
+
+static void
+	ft_draw_tnum(int8_t id, int16_t y, int16_t x, t_cub *cl)
+{
+	const int16_t	scl = cl->mlist.scale;
+
+	cl->img.ptr[(x + 10) * 4 +
+		(cl->img.sizeline * (int)(y + ((cl->wlist.y_size - 10) -
+		(2 * ((cl->mlist.map_h * scl) / 1.3)) - 5)))] =
+		(uint8_t)cl->tnum[id].ptr[cl->tnum[id].tex_x * 4 + 4 *
+		cl->tnum[id].img_w * cl->tnum[id].tex_y];
+	cl->img.ptr[(x + 10) * 4 +
+		(cl->img.sizeline * (int)(y + ((cl->wlist.y_size - 10) -
+		(2 * ((cl->mlist.map_h * scl) / 1.3)) - 5))) + 1] =
+		(uint8_t)cl->tnum[id].ptr[cl->tnum[id].tex_x * 4 + 4 *
+		cl->tnum[id].img_w * cl->tnum[id].tex_y + 1];
+	cl->img.ptr[(x + 10) * 4 +
+		(cl->img.sizeline * (int)(y + ((cl->wlist.y_size - 10) -
+		(2 * ((cl->mlist.map_h * scl) / 1.3)) - 5))) + 2] =
+		(uint8_t)cl->tnum[id].ptr[cl->tnum[id].tex_x * 4 + 4 *
+		cl->tnum[id].img_w * cl->tnum[id].tex_y + 2];
+}
+
+static void
+	ft_put_next_number(char n, uint16_t x_offset, t_cub *cl)
+{
+	int32_t	x_ratio;
+	int32_t	y_ratio;
+	int16_t	x;
+	int16_t	y;
+
+	x_ratio = (int)(((cl->tnum[n - 48].img_w) << 16) / cl->ammo_num_w) + 1;
+	y_ratio = (int)(((cl->tnum[n - 48].img_h) << 16) / cl->ammo_num_h) + 1;
+	y = 0;
+	while (y < cl->ammo_num_h)
+	{
+		cl->tnum[n - 48].tex_y = ((y * y_ratio) >> 16);
+		x = 0;
+		while (x < cl->ammo_num_w)
+		{
+			cl->tnum[n - 48].tex_x = ((x * x_ratio) >> 16);
+			if (cl->tnum[n - 48].ptr[cl->tnum[n - 48].tex_x * 4 + 4 *
+				cl->tnum[n - 48].img_h * cl->tnum[n - 48].tex_y])
+				ft_draw_tnum(n - 48, y, x + x_offset, cl);
+			x++;
+		}
+		y++;
+	}
+}
+
+static void
+	ft_put_image_from_number(char *num, t_cub *cl)
+{
+	const size_t	len = ft_strlen(num);
+	const int16_t	scl = cl->mlist.scale;
+
+	if (len == 4)
+	{
+		ft_put_next_number(num[0], 0, cl);
+		ft_put_next_number(num[1], (1 * (cl->mlist.map_w * scl) / 4), cl);
+		ft_put_next_number(num[2], (2 * (cl->mlist.map_w * scl) / 4), cl);
+		ft_put_next_number(num[3], (3 * (cl->mlist.map_w * scl) / 4), cl);
+	}
+	else if (len == 3)
+	{
+		ft_put_next_number(num[0], (1 * (cl->mlist.map_w * scl) / 4), cl);
+		ft_put_next_number(num[1], (2 * (cl->mlist.map_w * scl) / 4), cl);
+		ft_put_next_number(num[2], (3 * (cl->mlist.map_w * scl) / 4), cl);
+	}
+	else if (len == 2)
+	{
+		ft_put_next_number(num[0], (1 * (cl->mlist.map_w * scl) / 4), cl);
+		ft_put_next_number(num[1], (2 * (cl->mlist.map_w * scl) / 4), cl);
+	}
+	else
+		ft_put_next_number(num[0], (2 * (cl->mlist.map_w * scl) / 4), cl);
+}
+
+static void
+	ft_get_hw(t_cub *cl)
+{
+	int16_t			x;
+	int16_t			y;
+	const int16_t	scl = cl->mlist.scale;
+
+	x = 10;
+	y = (cl->wlist.y_size - 10) - (2 * ((cl->mlist.map_h * scl) / 1.3)) - 5;
+	while (y < (int16_t)(cl->wlist.y_size - (cl->mlist.map_h * scl) - 30))
+	{
+		while (x < (int16_t)((cl->mlist.map_w * scl) / 4) + 20)
+			x++;
+		y++;
+	}
+	y -= (cl->wlist.y_size - 10) - (2 * ((cl->mlist.map_h * scl) / 1.3)) - 5;
+	x -= 10;
+	y = (y <= 0) ? (1) : (y);
+	x = (x <= 0) ? (1) : (x);
+	cl->ammo_num_h = y;
+	cl->ammo_num_w = x;
+}
+
+void
+	ft_draw_ammo_bar(t_cub *cl)
+{
+	char			num[5];
+	uint8_t			w_id;
+
+	w_id = cl->plist.handles_weapon;
+	w_id = (cl->plist.handles_weapon == 2) ? (1) : (w_id);
+	w_id = (cl->plist.handles_weapon == 4) ? (2) : (w_id);
+	ft_get_hw(cl);
+	if (cl->plist.ammo[w_id] >= 0)
+	{
+		ft_sprintf(num, "%hd", cl->plist.ammo[w_id]);
+		ft_put_image_from_number(num, cl);
+	}
+	else if (cl->plist.ammo[w_id] == -4)
+	{
+		ft_put_next_number(59,
+			(2 * (cl->mlist.map_w * cl->mlist.scale) / 4), cl);
+	}
+}
+	
diff --git a/src/ft_draw_ammo_caption.c b/src/ft_draw_ammo_caption.c
index 9231478..0d35c34 100644
--- a/src/ft_draw_ammo_caption.c
+++ b/src/ft_draw_ammo_caption.c
@@ -74,7 +74,6 @@ static void
 	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++;
diff --git a/src/ft_draw_hud.c b/src/ft_draw_hud.c
index 1074e3b..a10b2f3 100644
--- a/src/ft_draw_hud.c
+++ b/src/ft_draw_hud.c
@@ -48,6 +48,7 @@ int8_t
 	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)
diff --git a/src/ft_draw_life_bar.c b/src/ft_draw_life_bar.c
index 955f20d..b7dc161 100644
--- a/src/ft_draw_life_bar.c
+++ b/src/ft_draw_life_bar.c
@@ -69,7 +69,6 @@ static void
 	const size_t	len = ft_strlen(num);
 	const int16_t	scl = cl->mlist.scale;
 
-	(void)cl;
 	if (len == 3)
 	{
 		ft_put_next_number(num[0], 0, cl);
@@ -96,7 +95,6 @@ static void
 	y = cl->wlist.y_size - (cl->mlist.map_h * scl) - 10;
 	while (y < (int16_t)(cl->wlist.y_size - 50))
 	{
-		x = ((cl->mlist.map_w * scl) + 20) + (24 * scl) - ((24 * scl) / 4);
 		while (x < (int16_t)((cl->mlist.map_w * scl) + 10 + ((24 * scl))))
 			x++;
 		y++;
diff --git a/src/ft_find_item.c b/src/ft_find_item.c
index cea05fa..59b4a4f 100644
--- a/src/ft_find_item.c
+++ b/src/ft_find_item.c
@@ -35,9 +35,11 @@ static void
 	if (weap_id == 0)
 		pl->ammo[0] = FT_WEAP_ONE_STRT_AMMO;
 	else if (weap_id == 1)
-		pl->ammo[1] = FT_WEAP_TWO_STRT_AMMO;
+		pl->ammo[1] += FT_WEAP_TWO_STRT_AMMO;
 	else if (weap_id == 2)
-		pl->ammo[2] = FT_WEAP_THREE_STRT_AMMO;
+		pl->ammo[2] += FT_WEAP_THREE_STRT_AMMO;
+	if (pl->ammo[weap_id] > FT_WEAP_MAX_AMMO)
+		pl->ammo[weap_id] = FT_WEAP_MAX_AMMO;
 }
 
 static void