diff options
| author | Rudy Bousset <bousset.rudy@gmail.com> | 2020-05-14 15:03:28 +0200 |
|---|---|---|
| committer | Rudy Bousset <bousset.rudy@gmail.com> | 2020-05-14 15:03:28 +0200 |
| commit | 113147926d79638132f145a71d0b9a3a74518589 (patch) | |
| tree | 647a92ec33e9c211f22c6eb3bdbd7f85fd43e694 | |
| parent | Added music to the main story (diff) | |
| download | 42-cub3d-113147926d79638132f145a71d0b9a3a74518589.tar.gz 42-cub3d-113147926d79638132f145a71d0b9a3a74518589.tar.bz2 42-cub3d-113147926d79638132f145a71d0b9a3a74518589.tar.xz 42-cub3d-113147926d79638132f145a71d0b9a3a74518589.tar.zst 42-cub3d-113147926d79638132f145a71d0b9a3a74518589.zip | |
Can't exit cleanly
| -rw-r--r-- | inc/cub3d_structs.h | 1 | ||||
| -rw-r--r-- | map/quest_start.cub | 2 | ||||
| -rw-r--r-- | minilibx-linux/Makefile.gen | 2 | ||||
| -rw-r--r-- | minilibx-linux/test/Makefile.gen | 2 | ||||
| -rw-r--r-- | src/ft_click_close.c | 4 | ||||
| -rw-r--r-- | src/ft_exit.c | 3 | ||||
| -rw-r--r-- | src/ft_init_lists.c | 1 |
7 files changed, 10 insertions, 5 deletions
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 9a605c9..0685730 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -243,6 +243,7 @@ typedef struct s_cub uint8_t walltexgood; uint8_t isoldmus; uint8_t doicast; + uint8_t clickclose; uint16_t currlvl; uint16_t i; uint16_t y; diff --git a/map/quest_start.cub b/map/quest_start.cub index 08ad883..2d4972f 100644 --- a/map/quest_start.cub +++ b/map/quest_start.cub @@ -1,4 +1,4 @@ -R 1200 1000 +R 1100 900 NO media/img/tex/castle_wall.xpm SO media/img/tex/castle_wall.xpm diff --git a/minilibx-linux/Makefile.gen b/minilibx-linux/Makefile.gen index 629a0a4..cd865f6 100644 --- a/minilibx-linux/Makefile.gen +++ b/minilibx-linux/Makefile.gen @@ -1,5 +1,5 @@ INC=/usr/include -HT=x86_64 +HT=Linux DOCP=do_cp ## ## Makefile for MiniLibX in /home/boulon/work/c/raytraceur/minilibx diff --git a/minilibx-linux/test/Makefile.gen b/minilibx-linux/test/Makefile.gen index 87788e6..2a6fb27 100644 --- a/minilibx-linux/test/Makefile.gen +++ b/minilibx-linux/test/Makefile.gen @@ -1,5 +1,5 @@ INC=/usr/include -HT=x86_64 +HT=Linux DOCP=do_cp diff --git a/src/ft_click_close.c b/src/ft_click_close.c index 6ed7b37..113c241 100644 --- a/src/ft_click_close.c +++ b/src/ft_click_close.c @@ -19,5 +19,7 @@ int ft_click_close(int keycode, t_cub *clist) { (void)keycode; - return (ft_exit(0, clist)); + (void)clist; + exit(0); + return (0); } diff --git a/src/ft_exit.c b/src/ft_exit.c index d9d9ef8..8d1b3ba 100644 --- a/src/ft_exit.c +++ b/src/ft_exit.c @@ -76,7 +76,8 @@ int { if (FT_OS == 1) mlx_destroy_image(clist->wlist.wlx, clist->img.img); - mlx_destroy_window(clist->wlist.wlx, clist->wlist.winptr); + if (clist->clickclose == 0) + mlx_destroy_window(clist->wlist.wlx, clist->wlist.winptr); } ft_cancel_threads(clist); ft_del_map(&clist->mlist); diff --git a/src/ft_init_lists.c b/src/ft_init_lists.c index 323d6a0..32c60f5 100644 --- a/src/ft_init_lists.c +++ b/src/ft_init_lists.c @@ -102,6 +102,7 @@ static int8_t cl->rlist = ft_init_s_ray(); cl->currlvl = 0; cl->walltexgood = 0; + cl->clickclose = 0; ft_init_funptr(cl); ft_init_ref(cl); return (0); |