diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-18 22:40:47 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-18 22:40:47 +0100 |
| commit | 3520f4bf3d435991f402e46731c15838baae0894 (patch) | |
| tree | c8cbf06ebd69a422cbcf2cb8381916af172da726 /inc/cub3d_structs.h | |
| parent | Still sfx to do (diff) | |
| parent | Bug fix (diff) | |
| download | 42-cub3d-3520f4bf3d435991f402e46731c15838baae0894.tar.gz 42-cub3d-3520f4bf3d435991f402e46731c15838baae0894.tar.bz2 42-cub3d-3520f4bf3d435991f402e46731c15838baae0894.tar.xz 42-cub3d-3520f4bf3d435991f402e46731c15838baae0894.tar.zst 42-cub3d-3520f4bf3d435991f402e46731c15838baae0894.zip | |
Merge branch 'master' into weaps
Diffstat (limited to '')
| -rw-r--r-- | inc/cub3d_structs.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index a08d7b2..dc2b411 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -113,8 +113,8 @@ typedef struct s_sprite int32_t y; int32_t tex_x; int32_t tex_y; - int32_t s_pos_x; - int32_t s_pos_y; + uint64_t s_pos_x; + uint64_t s_pos_y; double spritex; double spritey; int32_t spriteheight; @@ -204,9 +204,11 @@ typedef struct s_map size_t mapl_len; int32_t sprite_nbr; uint8_t sprite_var; - int32_t sprite_order[4096]; + int32_t sprite_order[8][4096]; int32_t traps_nbr; + int32_t heals_nbr; int32_t traps_order[512]; + int32_t heals_order[64]; size_t line_chk; size_t map_start; uint8_t isspawn; @@ -216,6 +218,7 @@ typedef struct s_map uint8_t isctex; uint8_t isskybox; uint8_t istraps; + uint8_t isheals; uint8_t darklvl; uint8_t scale; int8_t topsp; @@ -250,9 +253,10 @@ typedef struct s_cub struct s_img death_screen; struct s_rgb f_rgb; struct s_rgb c_rgb; - struct s_img tlist[17]; + struct s_img tlist[18]; struct s_sprite **sprites; struct s_sprite traps[512]; + struct s_sprite heals[64]; struct s_sfx sfx; } t_cub; |