aboutsummaryrefslogtreecommitdiffstats
path: root/inc/cub3d.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--inc/cub3d.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h
index 87f6ef3..a6131b7 100644
--- a/inc/cub3d.h
+++ b/inc/cub3d.h
@@ -82,6 +82,10 @@ 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