diff options
| author | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-02-20 04:58:01 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-02-20 04:58:01 +0100 |
| commit | b3f30a708469fd30d4b23d2b5fd5ad3a0d839b42 (patch) | |
| tree | 806fa965da37bef2a8066b65c28a6f033423b05a | |
| parent | Merge branch 'textures_fix' (diff) | |
| download | 42-cub3d-b3f30a708469fd30d4b23d2b5fd5ad3a0d839b42.tar.gz 42-cub3d-b3f30a708469fd30d4b23d2b5fd5ad3a0d839b42.tar.bz2 42-cub3d-b3f30a708469fd30d4b23d2b5fd5ad3a0d839b42.tar.xz 42-cub3d-b3f30a708469fd30d4b23d2b5fd5ad3a0d839b42.tar.zst 42-cub3d-b3f30a708469fd30d4b23d2b5fd5ad3a0d839b42.zip | |
Fixed HEAD conflicts, pretty bav
Diffstat (limited to '')
| -rw-r--r-- | inc/cub3d.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index a6131b7..09ea32e 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -82,10 +82,7 @@ int ft_key_loop(t_cub *cl); void ft_draw_circle(int32_t a, int32_t b, int32_t color, t_cub *cl); void ft_draw_texture(t_cub *cl, int x, int y, int tex_y); -<<<<<<< HEAD int8_t ft_check_not_found(const char *path); -======= void ft_calc_tex(t_cub *clist); ->>>>>>> textures_fix # endif |