diff --git a/.gitignore b/.gitignore index 2aa07d5..b9b324b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,5 @@ libft/**/*.o libft/**/*.a src/main.c vgcore.* -src/cub3d.c Makefile +src/cub3d.c diff --git a/includes/game.h b/includes/game.h index ccc1c7d..8d6fc5b 100644 --- a/includes/game.h +++ b/includes/game.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/11 16:38:40 by adjoly #+# #+# */ -/* Updated: 2024/09/12 11:40:07 by adjoly ### ########.fr */ +/* Updated: 2024/09/12 17:04:59 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,6 @@ typedef struct s_cub { void *mlx; void *win; - int (*key_hook)(int, void*); void *images; char **map; } t_cub; @@ -27,6 +26,7 @@ typedef struct s_cub #define S_KEY 22 #define A_KEY 4 #define D_KEY 7 +#define WHITE 0xFFFFFFFF /** * @brief This function is used to handle keypress diff --git a/src/cub3d.c b/src/cub3d.c deleted file mode 100644 index 38e72ef..0000000 --- a/src/cub3d.c +++ /dev/null @@ -1,41 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* cub3d.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: madumerg +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2024/09/04 16:58:27 by madumerg #+# #+# */ -/* Updated: 2024/09/12 16:56:30 by madumerg ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "cub3d.h" -#include "libft.h" -#include "parsing.h" - -t_pars init_pars(void) -{ - t_pars new; - - new = ft_calloc(sizeof(t_pars)); - if (!new) - return (NULL); - new->f_color = 0; - new->c_color = 0; - new->coor->x = 0; - new->coor->y = 0 - return (new); -} - -int main(int ac, char **av) -{ - t_pars pars; - - pars = init_pars(void); - if (check_err_arg(ac, av) == 1) - return (1); - if (verif_info_map(av[1], &pars) == 1) - return (1); - return (0); -} diff --git a/src/event_handler.c b/src/event_handler.c index c153eff..5bb53a7 100644 --- a/src/event_handler.c +++ b/src/event_handler.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/11 16:37:56 by adjoly #+# #+# */ -/* Updated: 2024/09/12 11:43:02 by adjoly ### ########.fr */ +/* Updated: 2024/09/12 14:40:22 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,11 +14,11 @@ #include "mlx.h" #include "game.h" -int key_hook(int key, void *mlx) +int key_hook(int key, t_cub *cub) { (void)mlx; if (key == ESCAPE_KEY) - mlx_loop_end(mlx); + mlx_loop_end(cub->mlx); if (key == W_KEY) printf("UP\n"); if (key == S_KEY)