From f06a9f89bdbf5123fd00a79d350d599509d689df Mon Sep 17 00:00:00 2001
From: JozanLeClerc <bousset.rudy@gmail.com>
Date: Tue, 31 Mar 2020 14:59:53 +0200
Subject: Big gameplay

---
 src/ft_shoot.c | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

(limited to 'src/ft_shoot.c')

diff --git a/src/ft_shoot.c b/src/ft_shoot.c
index 7f23bfd..5342509 100644
--- a/src/ft_shoot.c
+++ b/src/ft_shoot.c
@@ -1,7 +1,7 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   ft_extra_keys.c                                    :+:      :+:    :+:   */
+/*   ft_shoot.c                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: rbousset <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
@@ -54,31 +54,42 @@ static int8_t
 	return (1);
 }
 
+static void
+	ft_set_sq(t_cub *cl)
+{
+	if (cl->rlist.x_side_dist < cl->rlist.y_side_dist)
+	{
+		cl->rlist.x_side_dist += cl->rlist.x_delta_dist;
+		cl->rlist.sqx += cl->mlist.x_step;
+		cl->rlist.side = 0;
+	}
+	else
+	{
+		cl->rlist.y_side_dist += cl->rlist.y_delta_dist;
+		cl->rlist.sqy += cl->mlist.y_step;
+		cl->rlist.side = 1;
+	}
+}
+
 static void
 	ft_hitscan(t_cub *cl, uint16_t hit)
 {
 	while (hit == 0)
 	{
-		if (cl->rlist.x_side_dist < cl->rlist.y_side_dist)
-		{
-			cl->rlist.x_side_dist += cl->rlist.x_delta_dist;
-			cl->rlist.sqx += cl->mlist.x_step;
-			cl->rlist.side = 0;
-		}
-		else
-		{
-			cl->rlist.y_side_dist += cl->rlist.y_delta_dist;
-			cl->rlist.sqy += cl->mlist.y_step;
-			cl->rlist.side = 1;
-		}
+		ft_set_sq(cl);
 		if (ft_ischarset(FT_CHRST_SPRITES,
 			cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy]) && ft_weap_range(cl))
 		{
 			hit = 1;
 			ft_hide_sprite(cl);
 		}
-		else if (ft_ischarset("1",
-			cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy]))
+		else if (cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy] == 'e' &&
+			ft_weap_range(cl))
+		{
+			hit = 1;
+			ft_damage_bad_boy(cl);
+		}
+		else if (cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy] == '1')
 			hit = 1;
 	}
 }
-- 
cgit v1.2.3