From 667f6c00fb4f1c42b31daa8b14f35721e9acddf9 Mon Sep 17 00:00:00 2001 From: kinou-p Date: Tue, 15 Feb 2022 00:57:50 +0100 Subject: [PATCH] done --- srcs/main.c | 29 ++--------------------------- srcs/main.o | Bin 13632 -> 0 bytes srcs/parsing.o | Bin 3336 -> 0 bytes srcs/print_map.o | Bin 2936 -> 8696 bytes srcs/so_long.h | 4 ++-- srcs/utils.c | 5 +++-- 6 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 srcs/main.o delete mode 100644 srcs/parsing.o diff --git a/srcs/main.c b/srcs/main.c index 40ed9a1..0c0ab12 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 16:42:55 by apommier #+# #+# */ -/* Updated: 2022/02/14 23:49:53 by apommier ### ########.fr */ +/* Updated: 2022/02/15 00:08:06 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -118,27 +118,6 @@ char **set_map(char **argv) return (map_tab); } -int button_press(int code, t_data *img) -{ - int i; - - - (void)code; - printf("img in buttom = %p\n", img); - printf("move = %d\n", img->move); - //printf("img->mlx = %p\n", img->mlx); - i = 0; - mlx_destroy_window(img->mlx, img->mlx_win); - mlx_destroy_display(img->mlx); - if (img->mlx) - free(img->mlx); - while (img->map_tab[i]) - free(img->map_tab[i++]); - free(img->map_tab); - //quit_game(img); - exit(1); -} - int main(int argc, char **argv) { t_data img; @@ -159,11 +138,7 @@ int main(int argc, char **argv) img.mlx_win = mlx_new_window(img.mlx, ft_strlen(img.map_tab[0]) * 32, height * 32, "Hungry Bear"); print_map(img.map_tab, &img); - printf("img in main= %p\n", &img); - //mlx_hook(img.mlx_win, DestroyNotify, NoEventMask, &button_press, &img); - mlx_hook(img.mlx_win, 2, 1L << 0, &key_press, &img); - mlx_hook(img.mlx_win, 33, 1L << 17, &button_press, &img); - //mlx_key_hook(img.mlx_win, &key_press, &img); + mlx_hook(img.mlx_win, 17, 0L, &quit_game, &img); mlx_loop(img.mlx); } diff --git a/srcs/main.o b/srcs/main.o deleted file mode 100644 index 5fc5afcbb4632c9c43c9584f91c859ac372e3c03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13632 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 diff --git a/srcs/parsing.o b/srcs/parsing.o deleted file mode 100644 index 06e5877138fdde97fa4539ebd63ebb34246b999a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3336 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 +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 16:30:59 by apommier #+# #+# */ -/* Updated: 2022/02/14 00:37:07 by apommier ### ########.fr */ +/* Updated: 2022/02/15 00:02:48 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -51,7 +51,7 @@ void check_arg(int argc, char **argv); //utils void ft_error(char *error_msg, char **map); int check_map(char **map); -void quit_game(t_data *img); +int quit_game(t_data *img); int key_press(int code, t_data *img); int *choose_bear(t_data *img); diff --git a/srcs/utils.c b/srcs/utils.c index 59604fe..9ef9eee 100644 --- a/srcs/utils.c +++ b/srcs/utils.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/13 23:37:02 by apommier #+# #+# */ -/* Updated: 2022/02/14 23:49:04 by apommier ### ########.fr */ +/* Updated: 2022/02/15 00:08:44 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -41,7 +41,7 @@ int check_map(char **map) return (1); } -void quit_game(t_data *img) +int quit_game(t_data *img) { int i; @@ -55,6 +55,7 @@ void quit_game(t_data *img) free(img->map_tab[i++]); free(img->map_tab); exit(1); + return (1); } int key_press(int code, t_data *img)