diff options
Diffstat (limited to 'src/ft_warp_level.c')
| -rw-r--r-- | src/ft_warp_level.c | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/ft_warp_level.c b/src/ft_warp_level.c index de87187..b122e46 100644 --- a/src/ft_warp_level.c +++ b/src/ft_warp_level.c @@ -32,7 +32,6 @@ static void ft_memdel((void**)&ml->music_cmd); ft_memdel((void**)&ml->mapl); ft_free_words(ml->map); - ft_memdel((void**)&ml); } static void @@ -40,22 +39,22 @@ static void { uint8_t i; - cl->plist->pos_x = 0; - cl->plist->pos_y = 0; - cl->plist->start_x = 0; - cl->plist->start_y = 0; - cl->plist->cam_x = 0; - cl->plist->dir_x = -1; - cl->plist->dir_y = 0; - cl->plist->plane_x = 0; - cl->plist->plane_y = 0.66666666; + cl->plist.pos_x = 0; + cl->plist.pos_y = 0; + cl->plist.start_x = 0; + cl->plist.start_y = 0; + cl->plist.cam_x = 0; + cl->plist.dir_x = -1; + cl->plist.dir_y = 0; + cl->plist.plane_x = 0; + cl->plist.plane_y = 0.66666666; cl->f_rgb = ft_init_rgb(); cl->c_rgb = ft_init_rgb(); cl->rlist = ft_init_s_ray(); i = 0; while (i <= 5) { - mlx_destroy_image(cl->wlist->wlx, cl->tlist[i].img); + mlx_destroy_image(cl->wlist.wlx, cl->tlist[i].img); cl->tlist[i].img = NULL; i++; } @@ -64,21 +63,21 @@ static void static void ft_treat_music(uint8_t isoldmus, char *tmp_mup, t_cub *cl) { - if (isoldmus && !cl->mlist->ismusic) + if (isoldmus && !cl->mlist.ismusic) { pthread_cancel(cl->tid); pthread_join(cl->tid, NULL); cl->isoldmus = 0; } - else if (isoldmus && cl->mlist->ismusic - && ft_strncmp(tmp_mup, cl->mlist->music_path, ft_strlen(tmp_mup) + 1)) + else if (isoldmus && cl->mlist.ismusic + && ft_strncmp(tmp_mup, cl->mlist.music_path, ft_strlen(tmp_mup) + 1)) { pthread_cancel(cl->tid); pthread_join(cl->tid, NULL); pthread_create(&cl->tid, NULL, ft_music_thread, cl); } - else if (isoldmus && cl->mlist->ismusic - && !ft_strncmp(tmp_mup, cl->mlist->music_path, ft_strlen(tmp_mup) + 1)) + else if (isoldmus && cl->mlist.ismusic + && !ft_strncmp(tmp_mup, cl->mlist.music_path, ft_strlen(tmp_mup) + 1)) return ; } @@ -89,19 +88,19 @@ int8_t char *tmp_mup; uint8_t isoldmus; - if ((uint32_t)cl->plist->pos_x == cl->mlist->nlx && - (uint32_t)cl->plist->pos_y == cl->mlist->nly) + if ((uint32_t)cl->plist.pos_x == cl->mlist.nlx && + (uint32_t)cl->plist.pos_y == cl->mlist.nly) { if (!(next_path = (char *)malloc((ft_strlen( - cl->mlist->nlevel_path) + 1) * sizeof(char)))) + cl->mlist.nlevel_path) + 1) * sizeof(char)))) return (-1); - ft_sprintf(next_path, "%s", cl->mlist->nlevel_path); - isoldmus = cl->mlist->ismusic; + ft_sprintf(next_path, "%s", cl->mlist.nlevel_path); + isoldmus = cl->mlist.ismusic; if (isoldmus) - tmp_mup = ft_strdup(cl->mlist->music_path); + tmp_mup = ft_strdup(cl->mlist.music_path); ft_del_some(cl); - ft_del_map(cl->mlist); - if (!(cl->mlist = ft_init_map())) + ft_del_map(&cl->mlist); + if (ft_init_map(&cl->mlist) < 0) return (-1); ft_parse_map(next_path, cl); ft_treat_music(isoldmus, tmp_mup, cl); |