From 8866ef5699150d0549096efa94fc311ff7a48dc7 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Tue, 3 Mar 2020 14:47:33 +0100 Subject: Changing stuff --- src/ft_exit.c | 70 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'src/ft_exit.c') diff --git a/src/ft_exit.c b/src/ft_exit.c index c022627..6622eb1 100644 --- a/src/ft_exit.c +++ b/src/ft_exit.c @@ -21,52 +21,52 @@ static void ft_free_lists(t_cub *clist) { - ft_memdel((void**)&clist->mlist->no_tex_path); - ft_memdel((void**)&clist->mlist->so_tex_path); - ft_memdel((void**)&clist->mlist->ea_tex_path); - ft_memdel((void**)&clist->mlist->we_tex_path); - ft_memdel((void**)&clist->mlist->sprite_path); - ft_memdel((void**)&clist->mlist->nl_tex_path); - ft_memdel((void**)&clist->mlist->nlevel_path); - ft_memdel((void**)&clist->mlist->music_path); - ft_memdel((void**)&clist->mlist->music_cmd); - ft_memdel((void**)&clist->mlist->mapl); - ft_free_words(clist->mlist->map); - ft_memdel((void**)&clist->mlist); - ft_memdel((void**)&clist->plist); - if (!clist->wlist->inited) - ft_memdel((void**)&clist->wlist->winptr); - ft_memdel((void**)&clist->wlist); + ft_memdel((void**)&clist.mlist.no_tex_path); + ft_memdel((void**)&clist.mlist.so_tex_path); + ft_memdel((void**)&clist.mlist.ea_tex_path); + ft_memdel((void**)&clist.mlist.we_tex_path); + ft_memdel((void**)&clist.mlist.sprite_path); + ft_memdel((void**)&clist.mlist.nl_tex_path); + ft_memdel((void**)&clist.mlist.nlevel_path); + ft_memdel((void**)&clist.mlist.music_path); + ft_memdel((void**)&clist.mlist.music_cmd); + ft_memdel((void**)&clist.mlist.mapl); + ft_free_words(clist.mlist.map); + ft_memdel((void**)&clist.mlist); + ft_memdel((void**)&clist.plist); + if (!clist.wlist.inited) + ft_memdel((void**)&clist.wlist.winptr); + ft_memdel((void**)&clist.wlist); ft_memdel((void**)&clist); } int ft_exit(uint8_t exit_code, t_cub *clist) { - if (clist->walltexgood) + if (clist.walltexgood) { - if (clist->tlist[0].img) - mlx_destroy_image(clist->wlist->wlx, clist->tlist[0].img); - if (clist->tlist[1].img) - mlx_destroy_image(clist->wlist->wlx, clist->tlist[1].img); - if (clist->tlist[2].img) - mlx_destroy_image(clist->wlist->wlx, clist->tlist[2].img); - if (clist->tlist[3].img) - mlx_destroy_image(clist->wlist->wlx, clist->tlist[3].img); - if (clist->tlist[4].img) - mlx_destroy_image(clist->wlist->wlx, clist->tlist[4].img); - if (clist->mlist->isnlvl && clist->tlist[5].img) - mlx_destroy_image(clist->wlist->wlx, clist->tlist[5].img); + if (clist.tlist[0].img) + mlx_destroy_image(clist.wlist.wlx, clist.tlist[0].img); + if (clist.tlist[1].img) + mlx_destroy_image(clist.wlist.wlx, clist.tlist[1].img); + if (clist.tlist[2].img) + mlx_destroy_image(clist.wlist.wlx, clist.tlist[2].img); + if (clist.tlist[3].img) + mlx_destroy_image(clist.wlist.wlx, clist.tlist[3].img); + if (clist.tlist[4].img) + mlx_destroy_image(clist.wlist.wlx, clist.tlist[4].img); + if (clist.mlist.isnlvl && clist.tlist[5].img) + mlx_destroy_image(clist.wlist.wlx, clist.tlist[5].img); } - if (clist->wlist->inited) + if (clist.wlist.inited) { - mlx_destroy_window(clist->wlist->wlx, clist->wlist->winptr); - clist->wlist->winptr = NULL; + mlx_destroy_window(clist.wlist.wlx, clist.wlist.winptr); + clist.wlist.winptr = NULL; } - if (clist->isoldmus && clist->wlist->inited) + if (clist.isoldmus && clist.wlist.inited) { - pthread_cancel(clist->tid); - pthread_join(clist->tid, NULL); + pthread_cancel(clist.tid); + pthread_join(clist.tid, NULL); } ft_free_lists(clist); ft_printf("Exiting program\n"); -- cgit v1.2.3