diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-19 14:00:59 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-19 14:00:59 +0100 |
| commit | 1bd6b6e64b02ce70e193bb108843bc0ee5c051c3 (patch) | |
| tree | 394788b4dc6f1248f44894798fc708e87f1bd8a1 /inc | |
| parent | Loaded weapon images needs to memory (diff) | |
| download | 42-cub3d-1bd6b6e64b02ce70e193bb108843bc0ee5c051c3.tar.gz 42-cub3d-1bd6b6e64b02ce70e193bb108843bc0ee5c051c3.tar.bz2 42-cub3d-1bd6b6e64b02ce70e193bb108843bc0ee5c051c3.tar.xz 42-cub3d-1bd6b6e64b02ce70e193bb108843bc0ee5c051c3.tar.zst 42-cub3d-1bd6b6e64b02ce70e193bb108843bc0ee5c051c3.zip | |
Correct init and frees
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d_defines.h | 6 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 8a435f2..a4f93c1 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -140,13 +140,13 @@ enum */ # define FT_CHRST_VALID_PARSE "RNSEWFCLMT" -# define FT_CHRST_MAP_ENTRY "0123456789NSEWLT+ " +# define FT_CHRST_MAP_ENTRY "0123456789NSEWLT!@+ " # define FT_CHRST_SPRITES "23456789" # define FT_CHRST_SPAWN "NSEW" -# define FT_CHRST_MAP_NON_WALL "023456789NESWLT+" +# define FT_CHRST_MAP_NON_WALL "023456789NESWLT!@+" # define FT_CHRST_COLLISION "123456789 " # define FT_CHRST_DETECT "1L" -# define FT_CHRST_ITEM "+!@" +# define FT_CHRST_ITEM "!@+" /* ** ====== BMP ====== diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 332ced4..174493d 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -207,8 +207,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 traps_order[512]; int32_t heals_order[64]; + int32_t weaps_order[2][1]; size_t line_chk; size_t map_start; uint8_t isspawn; @@ -219,6 +221,7 @@ typedef struct s_map uint8_t isskybox; uint8_t istraps; uint8_t isheals; + uint8_t isweapon[2]; uint8_t darklvl; uint8_t scale; int8_t topsp; @@ -258,6 +261,7 @@ typedef struct s_cub struct s_sprite **sprites; struct s_sprite traps[512]; struct s_sprite heals[64]; + struct s_sprite weaps[2][1]; struct s_sfx sfx; } t_cub; |