diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-19 13:28:52 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-19 13:28:52 +0100 |
| commit | f57f187a59840d07cd47058022c44d464ad76522 (patch) | |
| tree | 22d7e5be602a8dbd21999e43760a1fc0d0b0fdb7 /inc | |
| parent | INTENSE mapping (diff) | |
| download | 42-cub3d-f57f187a59840d07cd47058022c44d464ad76522.tar.gz 42-cub3d-f57f187a59840d07cd47058022c44d464ad76522.tar.bz2 42-cub3d-f57f187a59840d07cd47058022c44d464ad76522.tar.xz 42-cub3d-f57f187a59840d07cd47058022c44d464ad76522.tar.zst 42-cub3d-f57f187a59840d07cd47058022c44d464ad76522.zip | |
Loaded weapon images needs to memory
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 3 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 4 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index fa42b4f..aedd550 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -61,7 +61,8 @@ void ft_death_hooks(t_win *wl, t_cub *cl); ** ====== TEXTURES ====== */ -void ft_wall_tex_init(t_cub *clist); +void ft_wall_tex_init(t_cub *cl); +void ft_weap_tex_init(t_cub *cl); void ft_choose_tex(t_cub *clist); /* diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index f5824ce..8a435f2 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -95,6 +95,8 @@ enum # define FT_SFX_TRAP_PATH "./media/sound/sfx/trap.wav" # define FT_DEATH_SCREEN_PATH "./media/img/screens/death_screen.xpm" # define FT_HUD_BACK_PATH "./media/img/tex/plate_small.xpm" +# define FT_WEAPON_ONE_SPR_PATH "./media/img/sprites/sword_s.xpm" +# define FT_WEAPON_TWO_SPR_PATH "./media/img/sprites/sword_s.xpm" # define FT_WEAPON_ONE_PATH "./media/img/weapons/sword_w.xpm" # define FT_WEAPON_ONE_FIRE_PATH "./media/img/weapons/sword_w_fire.xpm" # define FT_WEAPON_TWO_PATH "./media/img/weapons/sword_w.xpm" @@ -227,6 +229,8 @@ enum # define FT_ERR_MISS_W_ONE_FIRE "weapon one shooting image" # define FT_ERR_MISS_W_TWO "weapon two image" # define FT_ERR_MISS_W_TWO_FIRE "weapon two shooting image" +# define FT_ERR_MISS_W_ONE_SPR "weapon one image" +# define FT_ERR_MISS_W_TWO_SPR "weapon one image" /* ** ====== OTHER ====== diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index fc3eead..332ced4 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -253,7 +253,8 @@ typedef struct s_cub struct s_img death_screen; struct s_rgb f_rgb; struct s_rgb c_rgb; - struct s_img tlist[18]; + struct s_img tlist[20]; + struct s_img tweap[4]; struct s_sprite **sprites; struct s_sprite traps[512]; struct s_sprite heals[64]; |