diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-04-04 17:31:04 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-04-04 17:31:04 +0200 |
| commit | 07ce2cc784a0d420fbc807244847b55389427f6c (patch) | |
| tree | 9ccd0f73be06633204d80f92c35f191cb9bbd1ff /inc | |
| parent | Merge branch 'adventures' into bad_boy_select (diff) | |
| download | 42-cub3d-07ce2cc784a0d420fbc807244847b55389427f6c.tar.gz 42-cub3d-07ce2cc784a0d420fbc807244847b55389427f6c.tar.bz2 42-cub3d-07ce2cc784a0d420fbc807244847b55389427f6c.tar.xz 42-cub3d-07ce2cc784a0d420fbc807244847b55389427f6c.tar.zst 42-cub3d-07ce2cc784a0d420fbc807244847b55389427f6c.zip | |
Selectable enemy
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 1 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 12 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index bfc0299..15d9ef0 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -68,6 +68,7 @@ void ft_wall_tex_init(t_cub *cl); void ft_next_sprite_init(t_cub *cl); void ft_weap_tex_init(t_cub *cl); void ft_num_tex_init(t_cub *cl); +void ft_tex_bad_boy_init(t_cub *cl); /* ** ====== DRAW ====== diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index da371a6..2829095 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -124,10 +124,14 @@ enum # define FT_WEAPON_TWO_FIRE_PATH "./media/img/weapons/colt_w_fire.xpm" # define FT_WEAPON_THREE_PATH "./media/img/weapons/double_b_w.xpm" # define FT_WEAPON_THREE_FIRE_PATH "./media/img/weapons/double_b_w_fire.xpm" -# define FT_ENMY_WAIT_PATH "./media/img/sprites/chr_cb1.xpm" -# define FT_ENMY_WALK_PATH "./media/img/sprites/chr_cb2.xpm" -# define FT_ENMY_FIRE_PATH "./media/img/sprites/chr_cb3.xpm" -# define FT_ENMY_DEAD_PATH "./media/img/sprites/chr_cbd.xpm" +# define FT_ENMY_WAIT_PATH "./media/img/sprites/skel_waiting.xpm" +# define FT_ENMY_WALK_PATH "./media/img/sprites/skel_walking.xpm" +# define FT_ENMY_FIRE_PATH "./media/img/sprites/skel_firing.xpm" +# define FT_ENMY_DEAD_PATH "./media/img/sprites/skel_dead.xpm" +# define FT_CB_WAIT_PATH "./media/img/sprites/chr_cb1.xpm" +# define FT_CB_WALK_PATH "./media/img/sprites/chr_cb2.xpm" +# define FT_CB_FIRE_PATH "./media/img/sprites/chr_cb3.xpm" +# define FT_CB_DEAD_PATH "./media/img/sprites/chr_cbd.xpm" # define FT_HEAL_PACK_PATH "./media/img/sprites/sr_hp.xpm" # define FT_ZER_PATH "./media/img/hud/zero.xpm" # define FT_ONE_PATH "./media/img/hud/one.xpm" diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 3eabcad..8d22b86 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -203,6 +203,7 @@ typedef struct s_map size_t line_chk; size_t map_start; uint8_t isspawn; + uint8_t enemy; uint8_t isnlvl; uint8_t ismusic; uint8_t isftex; @@ -259,7 +260,7 @@ typedef struct s_cub 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]; + char ref[23][3]; struct s_win wlist; struct s_player plist; struct s_map mlist; |