42_adjoly/so_long
Archived
1
0
Fork 0
Code Activity

so_long fixed

Browse Source
This commit is contained in:
Adam Joly
2024-01-30 08:28:45 +01:00
parent 15b156df0c
commit e1a6240d81
10 changed files with 67 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
move_character/ft_move_down.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/26 15:50:27 by adjoly #+# #+# */
/* Updated: 2024/01/27 16:50:29 by adjoly ### ########.fr */
/* Updated: 2024/01/30 08:26:30 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,7 +21,19 @@ void ft_move_down2(t_window *win, char c, char nxt)
void ft_move_down(t_window *win)
{
if (win->p_coords->y == win->e_coords->y
if (win->map[win->p_coords->y + 1][win->p_coords->x] == 'C')
{
if (win->p_coords->y == win->e_coords->y
&& win->p_coords->x == win->e_coords->x)
ft_putimg(win->p_coords->x, win->p_coords->y, win, 'E');
else
ft_putimg(win->p_coords->x, win->p_coords->y, win, '0');
win->map[win->p_coords->y + 1][win->p_coords->x] = '0';
ft_putimg(win->p_coords->x, win->p_coords->y + 1, win, 'P');
win->c_count--;
ft_printmov(win);
}
else if (win->p_coords->y == win->e_coords->y
&& win->e_coords->x == win->p_coords->x
&& win->map[win->p_coords->y + 1][win->p_coords->x] != '1')
ft_move_down2(win, 'E', 'P');
@ -31,14 +43,6 @@ void ft_move_down(t_window *win)
ft_printmov(win);
ft_exit(win);
}
else if (win->map[win->p_coords->y + 1][win->p_coords->x] == 'C')
{
ft_putimg(win->p_coords->x, win->p_coords->y, win, '0');
win->map[win->p_coords->y + 1][win->p_coords->x] = '0';
ft_putimg(win->p_coords->x, win->p_coords->y + 1, win, 'P');
win->c_count--;
ft_printmov(win);
}
else if (win->map[win->p_coords->y + 1][win->p_coords->x] != '1')
ft_move_down2(win, '0', 'P');
}

24
move_character/ft_move_left.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/26 15:50:22 by adjoly #+# #+# */
/* Updated: 2024/01/27 16:50:32 by adjoly ### ########.fr */
/* Updated: 2024/01/30 08:26:13 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,7 +21,19 @@ void ft_move_left2(t_window *win, char c, char nxt)
void ft_move_left(t_window *win)
{
if (win->p_coords->y == win->e_coords->y
if (win->map[win->p_coords->y][win->p_coords->x - 1] == 'C')
{
if (win->p_coords->y == win->e_coords->y
&& win->p_coords->x == win->e_coords->x)
ft_putimg(win->p_coords->x, win->p_coords->y, win, 'E');
else
ft_putimg(win->p_coords->x, win->p_coords->y, win, '0');
win->map[win->p_coords->y][win->p_coords->x - 1] = '0';
ft_putimg(win->p_coords->x - 1, win->p_coords->y, win, 'P');
win->c_count--;
ft_printmov(win);
}
else if (win->p_coords->y == win->e_coords->y
&& win->e_coords->x == win->p_coords->x
&& win->map[win->p_coords->y][win->p_coords->x - 1] != '1')
ft_move_left2(win, 'E', 'P');
@ -31,14 +43,6 @@ void ft_move_left(t_window *win)
ft_printmov(win);
ft_exit(win);
}
else if (win->map[win->p_coords->y][win->p_coords->x - 1] == 'C')
{
ft_putimg(win->p_coords->x, win->p_coords->y, win, '0');
win->map[win->p_coords->y][win->p_coords->x - 1] = '0';
ft_putimg(win->p_coords->x - 1, win->p_coords->y, win, 'P');
win->c_count--;
ft_printmov(win);
}
else if (win->map[win->p_coords->y][win->p_coords->x - 1] != '1')
ft_move_left2(win, '0', 'P');
}

24
move_character/ft_move_right.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/26 15:50:32 by adjoly #+# #+# */
/* Updated: 2024/01/27 16:50:36 by adjoly ### ########.fr */
/* Updated: 2024/01/30 08:25:36 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,7 +21,19 @@ void ft_move_right2(t_window *win, char c, char nxt)
void ft_move_right(t_window *win)
{
if (win->p_coords->y == win->e_coords->y
if (win->map[win->p_coords->y][win->p_coords->x + 1] == 'C')
{
if (win->p_coords->y == win->e_coords->y
&& win->p_coords->x == win->e_coords->x)
ft_putimg(win->p_coords->x, win->p_coords->y, win, 'E');
else
ft_putimg(win->p_coords->x, win->p_coords->y, win, '0');
win->map[win->p_coords->y][win->p_coords->x + 1] = '0';
ft_putimg(win->p_coords->x + 1, win->p_coords->y, win, 'P');
win->c_count--;
ft_printmov(win);
}
else if (win->p_coords->y == win->e_coords->y
&& win->e_coords->x == win->p_coords->x
&& win->map[win->p_coords->y][win->p_coords->x + 1] != '1')
ft_move_right2(win, 'E', 'P');
@ -31,14 +43,6 @@ void ft_move_right(t_window *win)
ft_printmov(win);
ft_exit(win);
}
else if (win->map[win->p_coords->y][win->p_coords->x + 1] == 'C')
{
ft_putimg(win->p_coords->x, win->p_coords->y, win, '0');
win->map[win->p_coords->y][win->p_coords->x + 1] = '0';
ft_putimg(win->p_coords->x + 1, win->p_coords->y, win, 'P');
win->c_count--;
ft_printmov(win);
}
else if (win->map[win->p_coords->y][win->p_coords->x + 1] != '1')
ft_move_right2(win, '0', 'P');
}

24
move_character/ft_move_up.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/26 15:50:35 by adjoly #+# #+# */
/* Updated: 2024/01/27 16:50:24 by adjoly ### ########.fr */
/* Updated: 2024/01/30 08:25:58 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,7 +21,19 @@ void ft_move_up2(t_window *win, char c, char nxt)
void ft_move_up(t_window *win)
{
if (win->p_coords->y == win->e_coords->y
if (win->map[win->p_coords->y - 1][win->p_coords->x] == 'C')
{
if (win->p_coords->y == win->e_coords->y
&& win->p_coords->x == win->e_coords->x)
ft_putimg(win->p_coords->x, win->p_coords->y, win, 'E');
else
ft_putimg(win->p_coords->x, win->p_coords->y, win, '0');
win->map[win->p_coords->y - 1][win->p_coords->x] = '0';
ft_putimg(win->p_coords->x, win->p_coords->y - 1, win, 'P');
win->c_count--;
ft_printmov(win);
}
else if (win->p_coords->y == win->e_coords->y
&& win->e_coords->x == win->p_coords->x
&& win->map[win->p_coords->y - 1][win->p_coords->x] != '1')
ft_move_up2(win, 'E', 'P');
@ -31,14 +43,6 @@ void ft_move_up(t_window *win)
ft_printmov(win);
ft_exit(win);
}
else if (win->map[win->p_coords->y - 1][win->p_coords->x] == 'C')
{
ft_putimg(win->p_coords->x, win->p_coords->y, win, '0');
win->map[win->p_coords->y - 1][win->p_coords->x] = '0';
ft_putimg(win->p_coords->x, win->p_coords->y - 1, win, 'P');
win->c_count--;
ft_printmov(win);
}
else if (win->map[win->p_coords->y - 1][win->p_coords->x] != '1')
ft_move_up2(win, '0', 'P');
}