diff options
| author | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-02-20 04:56:11 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-02-20 04:56:11 +0100 |
| commit | c51b1fb82dbcc90a923375e31a23e963e5161f08 (patch) | |
| tree | 082f6a470723dc673da3666cce791da67f1df5ac /inc | |
| parent | Norme (diff) | |
| parent | asd works cool (diff) | |
| download | 42-cub3d-c51b1fb82dbcc90a923375e31a23e963e5161f08.tar.gz 42-cub3d-c51b1fb82dbcc90a923375e31a23e963e5161f08.tar.bz2 42-cub3d-c51b1fb82dbcc90a923375e31a23e963e5161f08.tar.xz 42-cub3d-c51b1fb82dbcc90a923375e31a23e963e5161f08.tar.zst 42-cub3d-c51b1fb82dbcc90a923375e31a23e963e5161f08.zip | |
Merge branch 'textures_fix'
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 4 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 2 |
2 files changed, 6 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 diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index baae914..66686eb 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -51,6 +51,8 @@ typedef struct s_player { float pos_x; float pos_y; + float start_x; + float start_y; float dir_x; float dir_y; float cam_x; |