aboutsummaryrefslogtreecommitdiffstats
path: root/inc/cub3d.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--inc/cub3d.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h
index d3e018e..d2594f9 100644
--- a/inc/cub3d.h
+++ b/inc/cub3d.h
@@ -78,6 +78,11 @@ int ft_key_release(int keycode, t_cub *clist);
int8_t ft_check_ext(const char *filep, const char *ext);
int32_t ft_convert_keycode(const int32_t tmp_code);
int ft_key_loop(t_cub *cl);
+<<<<<<< HEAD
+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);
+>>>>>>> textures
# endif