avancement

games/enemy.c

@@ -1,21 +1,27 @@
-int	path_finding(char **map_cpy, t_xy cur, t_xy ply, int nbr)
+void	distance_player(char **map, int x, int y, int nbr)
 {
+	map[x][y] = nbr + '0';
+	if (map[x][y + 1] != '1' && map[x][y + 1] == '0')
+		distance_player(map, x, y + 1, nbr + 1)
+	if (map[x + 1][y] != '1' && map[x + 1][y] == '0')
+		distance_player(map, x + 1, y, nbr + 1)
+	if (map[x - 1][y] != '1' && map[x + 1][y] == '0')
+		distance_player(map, x - 1, y, nbr + 1)
+	if (map[x][y - 1] != '1' && map[x][y - 1] == '0')
+		distance_player(map, x, y - 1, nbr + 1)
+}
+
+t_xy	path_finding(t_data *data, int x, int y)
+{
+	t_xy	new_pos;
+	char	**map_cpy;
+
 	if (cur.x == ply.x && cur.y == ply.y)
-		return (nbr);
+		return (0);
-	map_cpy[x][y] = 'x';
+	map_cpy = ft_strdups(data->map);
-	if (map_cpy[x][y + 1] != '1' && map_cpy[x][y + 1] != 'x')
+	distance_player(map_cpy, x, y, 0);
-		if (is_possible(map, map_cpy, x, y + 1, nbr++))
+
-			
+
-	if (map_cpy[x + 1][y] != '1' && map_cpy[x + 1][y] != 'x')
-		if (is_possible(map, map_cpy, x + 1, y, nbr))
-			
-	if (map_cpy[x - 1][y] != '1' && map_cpy[x - 1][y] != 'x')
-		if (is_possible(map, map_cpy, x - 1, y, nbr))
-			*check = 
-	if (map_cpy[x][y - 1] != '1' && map_cpy[x][y - 1] != 'x')
-		if (is_possible(map, map_cpy, x, y - 1, nbr))
-			*check = 1;
-	return (0);
 }
 
 void	move_enemy(t_data *data)

games/init.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/12/29 18:06:18 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/01/01 19:49:56 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/01/02 16:28:52 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -74,9 +74,9 @@ int	trgb(int t, int r, int g, int b)
 int	render(t_data *data)
 {
 	char	*str_move;
-	t_xy	pos;
+	t_xy	*pos;
 
-	/*if (data->tick >= 5 && data->x_ene != -1)
+	/*if (data->tick >= 20 && data->x_ene != -1)
 	{
 		data->tick = 0;
 		move_enemy(data);
@@ -85,10 +85,16 @@ int	render(t_data *data)
 		data->tick++;*/
 	if (data->update == 1)
 	{
-		if (has_element(data->map, '3'))
+		if (data->x_ene != -1 && has_element(data->map, '3'))
 		{
 			pos = get_position(data->map, '3');
-
+			if (data->x_player != pos->x || data->y_player != pos->y)
+			{
+				set_element(data, pos->x, pos->y, 'e');
+				data->x_ene = pos->x;
+				data->y_ene = pos->y;
+			}
+			free(pos);
 		}
 		draw(data);
 		mlx_put_image_to_window(data->mlx, data->mlx_win, data->imgs.bg, 0, 0);

games/player.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/12/29 18:06:32 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/01/01 19:39:28 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/01/02 16:30:35 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -39,7 +39,7 @@ void	move(t_data *data, int x, int y)
 		return ;
 	if (get_new_element(data, x, y) == 'C')
 		set_new_element(data, x, y);
-	if (get_new_element(data, x, y) == 'E')
+	if (get_new_element(data, x, y) == 'E' || get_new_element(data, x, y) == 'e')
 		if (end(data))
 			return ;
 	data->x_player += x;

games/position.c

@@ -54,3 +54,8 @@ char	get_element(t_data *data, t_xy xy)
 {
 	return (data->map[xy.y][xy.x]);
 }
+
+void	set_element(t_data *data, int x, int y, char element)
+{
+	data->map[y][x] = element;
+}

games/render.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/12/29 18:06:42 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/01/01 19:39:55 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/01/02 16:24:06 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,6 +27,8 @@ static void	*assets(t_data *data, int x, int y)
 		return (data->imgs.col[dist]);
 	else if (c == 'E')
 		return (data->imgs.exit[dist]);
+	else if (c == 'e')
+		return (data->imgs.ene);
 	return (data->imgs.bg);
 }
 

so_long.h

@@ -77,6 +77,7 @@ void	*set_position_player(t_data *data, t_xy *xy);
 t_xy	*get_position(char **map, char c);
 int	has_element(char **map, char c);
 char	get_element(t_data *data, t_xy xy);
+void	set_element(t_data *data, int x, int y, char element);
 
 // Quit
 int	quit(t_data *data);