rparodi/Cub3D
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: fix on multiple player catch + traverse map ' ' != wall

Browse source
This commit is contained in:
Baptiste Goulard coderc de lacam 2024-12-20 16:56:04 +01:00
parent 22a93a5a58
commit 06e47c0309
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
includes/cub3d_struct.h
View file

@ -6,7 +6,7 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */ /* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/28 13:53:54 by bgoulard #+# #+# */ /* Created: 2024/11/28 13:53:54 by bgoulard #+# #+# */
/* Updated: 2024/12/20 15:42:21 by bgoulard ### ########.fr */ /* Updated: 2024/12/20 16:54:34 by bgoulard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -72,6 +72,7 @@ typedef enum e_tile
{ {
EMPTY = 0, EMPTY = 0,
WALL = 1, WALL = 1,
WALL_ERR = 3,
NONE = 2 NONE = 2
} t_tile_type; } t_tile_type;

22
parsing/load_tiles.c
View file

@ -6,7 +6,7 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */ /* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/01 17:47:15 by bgoulard #+# #+# */ /* Created: 2024/12/01 17:47:15 by bgoulard #+# #+# */
/* Updated: 2024/12/20 16:35:03 by bgoulard ### ########.fr */ /* Updated: 2024/12/20 16:54:12 by bgoulard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -29,8 +29,10 @@ int str_to_tile(const char *str, t_tile *tile, size_t size)
i = 0; i = 0;
while (str[i]) while (str[i])
{ {
if (str[i] == '1' || str[i] == ' ') if (str[i] == '1')
tile[i].tile_type = WALL; tile[i].tile_type = WALL;
else if (str[i] == ' ')
tile[i].tile_type = WALL_ERR;
else if (!ft_strchr("0NSWE", str[i])) else if (!ft_strchr("0NSWE", str[i]))
return (-1); return (-1);
else else
@ -69,28 +71,22 @@ t_vector *load_vector(t_map *map)
static bool multiple_player_same_line(const char *str) static bool multiple_player_same_line(const char *str)
{ {
const bool p_symbol[8] = {\ const char *identifiers = "NEWS";
!ft_strchr(str, 'S'), !ft_strchr(str, 'E'), !ft_strchr(str, 'W'), \
!ft_strchr(str, 'N'), !(ft_strrchr(str, 'N') - ft_strchr(str, 'N')), \
!(ft_strrchr(str, 'E') - ft_strchr(str, 'E')), \
!(ft_strrchr(str, 'W') - ft_strchr(str, 'W')), \
!(ft_strrchr(str, 'S') - ft_strchr(str, 'S')), };
int i; int i;
int j; int j;
i = 0; i = 0;
while (i < 4) while (i < 4)
{ {
if (ft_strchr(str, identifiers[i]) != ft_strrchr(str, identifiers[i]))
return (true);
j = i + 1; j = i + 1;
while (j < 4) while (j < 4)
if (!p_symbol[j++] && !p_symbol[i]) if (ft_strchr(str, identifiers[j++]) && \
ft_strchr(str, identifiers[i]))
return (true); return (true);
i++; i++;
} }
i = 0;
while (i < 4)
if (p_symbol[i++ + 4] && !p_symbol[i])
return (true);
return (false); return (false);
} }

4
parsing/traverse_map.c
View file

@ -6,7 +6,7 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */ /* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/01 17:49:12 by bgoulard #+# #+# */ /* Created: 2024/12/01 17:49:12 by bgoulard #+# #+# */
/* Updated: 2024/12/20 14:49:43 by bgoulard ### ########.fr */ /* Updated: 2024/12/20 16:54:55 by bgoulard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -33,7 +33,7 @@ bool flood_fill(t_tile *tiles, t_ipoint pos, t_ipoint maxs)
current = c3_get_cell(tiles, maxs, pos); current = c3_get_cell(tiles, maxs, pos);
if (current->tile_visited == true || current->tile_type == WALL) if (current->tile_visited == true || current->tile_type == WALL)
return (true); return (true);
if (current->tile_type == NONE) if (current->tile_type == NONE || current->tile_type == WALL_ERR)
return (false); return (false);
current->tile_visited = true; current->tile_visited = true;
i = 0; i = 0;