diff options
| author | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-03-12 16:52:18 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-03-12 16:52:18 +0100 |
| commit | 3212c77bf30acdf7538bfc103d27a46cae03d250 (patch) | |
| tree | f151d61c350cab0acddbe1fab473e4badb6c02c2 /inc | |
| parent | Clang is cool anyway (diff) | |
| parent | NORMED AND FIXED .......!!! (diff) | |
| download | 42-cub3d-3212c77bf30acdf7538bfc103d27a46cae03d250.tar.gz 42-cub3d-3212c77bf30acdf7538bfc103d27a46cae03d250.tar.bz2 42-cub3d-3212c77bf30acdf7538bfc103d27a46cae03d250.tar.xz 42-cub3d-3212c77bf30acdf7538bfc103d27a46cae03d250.tar.zst 42-cub3d-3212c77bf30acdf7538bfc103d27a46cae03d250.zip | |
Merge branch 'multis'
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d_defines.h | 2 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 6ab05c2..457f121 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -115,7 +115,7 @@ enum */ # define FT_CHRST_VALID_PARSE "RNSEWFCLMT" -# define FT_CHRST_MAP_ENTRY "012NSEWLT " +# define FT_CHRST_MAP_ENTRY "01234NSEWLT " # define FT_CHRST_SPAWN "NSEW" # define FT_CHRST_MAP_NON_WALL "02NESWLT" # define FT_CHRST_COLLISION "12 " diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 7a30d09..8fba623 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -87,6 +87,7 @@ typedef struct s_rgb typedef struct s_sprite { int32_t spritescreenx; + int32_t current_sprite; int32_t x; int32_t y; int32_t tex_x; @@ -182,6 +183,7 @@ typedef struct s_map size_t map_h; size_t mapl_len; int32_t sprite_nbr; + uint8_t sprite_var; int32_t sprite_order[4096]; int32_t traps_nbr; int32_t traps_order[512]; @@ -227,7 +229,7 @@ typedef struct s_cub struct s_rgb f_rgb; struct s_rgb c_rgb; struct s_img tlist[16]; - struct s_sprite sprites[4096]; + struct s_sprite sprites[8][4096]; struct s_sprite traps[512]; } t_cub; |