diff options
| author | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-02-19 16:57:39 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-02-19 16:57:39 +0100 |
| commit | 94b688c234660708edacf5d49df0e8bd3243cd6a (patch) | |
| tree | 00debcda04429d9814de1789f08245355ec4e502 /inc/cub3d.h | |
| parent | Tweaks (diff) | |
| parent | yes :^) ! (diff) | |
| download | 42-cub3d-94b688c234660708edacf5d49df0e8bd3243cd6a.tar.gz 42-cub3d-94b688c234660708edacf5d49df0e8bd3243cd6a.tar.bz2 42-cub3d-94b688c234660708edacf5d49df0e8bd3243cd6a.tar.xz 42-cub3d-94b688c234660708edacf5d49df0e8bd3243cd6a.tar.zst 42-cub3d-94b688c234660708edacf5d49df0e8bd3243cd6a.zip | |
Merge branch 'textures'
Diffstat (limited to '')
| -rw-r--r-- | inc/cub3d.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 22ce582..d2594f9 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -78,7 +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 |