diff options
| author | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 18:59:58 +0100 |
|---|---|---|
| committer | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 18:59:58 +0100 |
| commit | b6388b5101d8187f746f91c89842e932a1d01cb6 (patch) | |
| tree | 70bd9ba7012f5906db01b485ec8f58f5a4697240 /inc/cub3d_structs.h | |
| parent | close but no cigar (diff) | |
| parent | ca tue (diff) | |
| download | 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.gz 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.bz2 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.xz 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.tar.zst 42-cub3d-b6388b5101d8187f746f91c89842e932a1d01cb6.zip | |
get merged
Diffstat (limited to 'inc/cub3d_structs.h')
| -rw-r--r-- | inc/cub3d_structs.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 1aaa1d5..8fba623 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -121,6 +121,7 @@ typedef struct s_player float cam_x; float plane_x; float plane_y; + int8_t life; } t_player; typedef struct s_ray @@ -138,6 +139,7 @@ typedef struct s_ray float y_delta_dist; int16_t wall_t; int16_t wall_b; + int16_t *wall_bz; uint8_t side; size_t sqx; size_t sqy; @@ -169,6 +171,7 @@ typedef struct s_map char *ce_tex_path; char *nlevel_path; char *skybox_path; + char *traps_path; char *music_path; char *music_cmd; char *mapl; @@ -182,6 +185,8 @@ typedef struct s_map int32_t sprite_nbr; uint8_t sprite_var; int32_t sprite_order[4096]; + int32_t traps_nbr; + int32_t traps_order[512]; size_t line_chk; size_t map_start; uint8_t isspawn; @@ -190,6 +195,7 @@ typedef struct s_map uint8_t isftex; uint8_t isctex; uint8_t isskybox; + uint8_t istraps; uint8_t darklvl; uint8_t scale; uint32_t nlx; @@ -204,6 +210,7 @@ typedef struct s_cub uint8_t ishud; uint8_t walltexgood; uint8_t isoldmus; + uint8_t doicast; uint16_t currlvl; uint16_t i; char *const *envp; @@ -211,17 +218,19 @@ typedef struct s_cub int32_t key_input[5]; pid_t mpid; int (*key_ptr[6])(struct s_cub*); - int8_t (*get_ptr[13])(char**, struct s_cub*); - char ref[14][3]; + int8_t (*get_ptr[14])(char**, struct s_cub*); + char ref[15][3]; struct s_win wlist; struct s_player plist; struct s_map mlist; struct s_ray rlist; struct s_img img; + struct s_img red_scr; struct s_rgb f_rgb; struct s_rgb c_rgb; - struct s_img tlist[12]; - struct s_sprite sprites[12][12]; + struct s_img tlist[16]; + struct s_sprite sprites[8][4096]; + struct s_sprite traps[512]; } t_cub; # endif |