frzysk/42_so_long
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: count moves

Browse source
This commit is contained in:
mcolonna 2024-04-08 17:18:27 +02:00
parent 35c3689841
commit 574e012721
5 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/TODO.md
View file

@ -1,5 +1,3 @@
- Count moves
- Show moves on the screen
- Change sprites for top and bottom borders
- ESC to quit (what's the point)
- Map conditions

3
includes/main/env.h
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/26 15:26:13 by mcolonna #+# #+# */
/* Updated: 2024/04/08 15:17:26 by mcolonna ### ########.fr */
/* Updated: 2024/04/08 16:23:27 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -28,6 +28,7 @@ typedef struct s_env
bool input[4];
int ketchup;
int max_ketchup;
int moves;
} t_env;
extern t_env g_env;

7
src/display/display1.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/26 15:05:30 by mcolonna #+# #+# */
/* Updated: 2024/04/02 18:03:21 by mcolonna ### ########.fr */
/* Updated: 2024/04/08 17:15:15 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -44,7 +44,12 @@ void display_erase(void)
void display_flush(void)
{
const t_memclass mc = mem_subclass(error_err, g_env.mc);
mlx_put_image_to_window(g_env.mlx, g_env.win, g_screenbuf.img, 0, 0);
mlx_string_put(g_env.mlx, g_env.win, 0, 10, 0xFFFFFF,
str_inttostr(error_err, mc, g_env.moves));
mem_freeall(mc);
}
void display_destroyall(void)

3
src/main/main.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/26 15:28:34 by mcolonna #+# #+# */
/* Updated: 2024/04/08 15:16:57 by mcolonna ### ########.fr */
/* Updated: 2024/04/08 17:18:03 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -43,6 +43,7 @@ int loop_hook(void)
int main(void)
{
g_env.max_ketchup = 0;
g_env.moves = 0;
g_env.mc = mem_newclass(error_err);
g_env.mlx = mlx_init();
if (!g_env.mlx)

10
src/room/object_snas.c
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/15 15:27:03 by mcolonna #+# #+# */
/* Updated: 2024/04/04 16:08:52 by mcolonna ### ########.fr */
/* Updated: 2024/04/08 17:11:46 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -27,8 +27,12 @@ static t_direction snas_brain(void)
static t_point snas_loop(t_object *obj, t_point pos)
{
return (character_loop(
&((t_snas_data *)obj->data)->character, pos, snas_brain));
t_point r;
r = character_loop(&((t_snas_data *)obj->data)->character, pos, snas_brain);
if (r.x || r.y)
g_env.moves++;
return (r);
}
static void snas_draw(t_object *obj, int x, int y)