diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-29 17:38:46 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-29 17:38:46 +0200 |
| commit | a07392fc219afc45000201d2f495694ad9b82763 (patch) | |
| tree | 0eb3f2b9003ad7ceae4692242e46de56e55053b0 /src/ft_raycasting.c | |
| parent | Removed skybox shit (diff) | |
| parent | Norm (diff) | |
| download | 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.gz 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.bz2 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.xz 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.tar.zst 42-cub3d-a07392fc219afc45000201d2f495694ad9b82763.zip | |
Merge branch 'fix-details'
Diffstat (limited to 'src/ft_raycasting.c')
| -rw-r--r-- | src/ft_raycasting.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/ft_raycasting.c b/src/ft_raycasting.c index 8a79154..67c3f4e 100644 --- a/src/ft_raycasting.c +++ b/src/ft_raycasting.c @@ -32,18 +32,18 @@ static void !(rl->fc_tex_x_tab = (int32_t***)malloc(2 * sizeof(int32_t**))) || !(rl->fc_tex_y_tab = (int32_t***)malloc(2 * sizeof(int32_t**))) || !(rl->row_dist_tab = (float*)malloc(y_s * sizeof(float)))) - ft_error(FT_RET_ALLOC_ERR, FT_ERR_ALLOCATE, cl); + ft_alloc_error(cl); x = -1; while (++x < 2) { if (!(rl->fc_tex_x_tab[x] = (int**)malloc(y_s * sizeof(int*))) || !(rl->fc_tex_y_tab[x] = (int**)malloc(y_s * sizeof(int*)))) - ft_error(FT_RET_ALLOC_ERR, FT_ERR_ALLOCATE, cl); + ft_alloc_error(cl); y = -1; while (++y < y_s) if (!(rl->fc_tex_x_tab[x][y] = (int*)malloc(x_s * sizeof(int))) || !(rl->fc_tex_y_tab[x][y] = (int*)malloc(x_s * sizeof(int)))) - ft_error(FT_RET_ALLOC_ERR, FT_ERR_ALLOCATE, cl); + ft_alloc_error(cl); } } @@ -107,9 +107,6 @@ void pthread_join(tid[0], 0x0); pthread_join(tid[1], 0x0); ft_calc_sprite(cl); - ft_calc_heal(cl); - ft_calc_trap(cl); - ft_calc_weaps(cl); if (cl->plist.handles_weapon > -1) ft_draw_handweap(cl); ft_del_tabs(cl); |