diff options
Diffstat (limited to 'src/ft_exit.c')
| -rw-r--r-- | src/ft_exit.c | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/src/ft_exit.c b/src/ft_exit.c index c022627..1be7a32 100644 --- a/src/ft_exit.c +++ b/src/ft_exit.c @@ -21,23 +21,19 @@ 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); + 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); + if (!clist->wlist.inited) + ft_memdel((void**)&clist->wlist.winptr); } int @@ -46,24 +42,24 @@ int if (clist->walltexgood) { if (clist->tlist[0].img) - mlx_destroy_image(clist->wlist->wlx, 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); + 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); + 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); + 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); + 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); |