diff options
Diffstat (limited to 'inc/cub3d.h')
| -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 d2594f9..f7e4d79 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -78,11 +78,8 @@ 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 |