diff options
Diffstat (limited to '')
| -rw-r--r-- | inc/cub3d_structs.h | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index f538c7e..809963c 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -133,8 +133,9 @@ typedef struct s_player float plane_y; uint8_t fire; int16_t life; - uint8_t has_weapon[2]; + uint8_t has_weapon[3]; int8_t handles_weapon; + int16_t ammo[3]; } t_player; typedef struct s_ray @@ -200,10 +201,10 @@ typedef struct s_map int32_t sprite_order[8][4096]; int32_t traps_nbr; int32_t heals_nbr; - int32_t weaps_nbr[2]; + int32_t weaps_nbr[3]; int32_t traps_order[512]; int32_t heals_order[64]; - int32_t weaps_order[2][1]; + int32_t weaps_order[3][1]; size_t line_chk; size_t map_start; uint8_t isspawn; @@ -214,9 +215,8 @@ typedef struct s_map uint8_t isskybox; uint8_t istraps; uint8_t isheals; - uint8_t isweapon[2]; uint8_t darklvl; - uint8_t scale; + uint16_t scale; int8_t topsp; uint32_t nlx; uint32_t nly; @@ -233,13 +233,24 @@ typedef struct s_cub uint8_t doicast; uint16_t currlvl; uint16_t i; - char *const *envp; char errmsg[64]; int32_t key_input[5]; char fps_count[9]; pthread_t mtid; int8_t isdead; uint8_t moves; + uint16_t map_back_h; + uint16_t map_back_w; + uint16_t amm_back_h; + uint16_t amm_back_w; + uint16_t life_cap_h; + uint16_t life_cap_w; + uint16_t life_num_h; + uint16_t life_num_w; + uint16_t ammo_cap_h; + uint16_t ammo_cap_w; + uint16_t ammo_num_h; + uint16_t ammo_num_w; int (*key_ptr[6])(struct s_cub*); int8_t (*get_ptr[14])(char**, struct s_cub*); char ref[22][3]; @@ -251,14 +262,14 @@ typedef struct s_cub struct s_img death_screen; struct s_rgb f_rgb; struct s_rgb c_rgb; - struct s_img tlist[20]; - struct s_img tweap[4]; - struct s_img tnum[11]; + struct s_img tlist[23]; + struct s_img tweap[6]; + struct s_img tnum[12]; struct s_sprite **sprites; struct s_sprite traps[512]; struct s_sprite heals[64]; - struct s_sprite weaps[2][1]; - struct s_sfx sfx[10]; + struct s_sprite **weaps; + struct s_sfx sfx[13]; } t_cub; # endif |