diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 3 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 12 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 6 |
3 files changed, 8 insertions, 13 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index d86cf74..bfc0299 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -255,6 +255,7 @@ void ft_bb_walk(t_bad_boy *bl, t_sprite *sl, t_map *ml); void ft_bb_fire(t_bad_boy *bl, t_sprite *sl, t_map *ml); void ft_check_bad_boy_shoot(t_cub *cl); void ft_damage_bad_boy(t_cub *cl); +int8_t ft_can_it_shoot(int8_t id, double d, t_cub *cl); /* ** ====== DELETION ====== @@ -284,7 +285,7 @@ void ft_find_item(t_player *pl, t_map *ml, t_cub *cl); int8_t ft_switch_weap_one(t_cub *cl); int8_t ft_switch_weap_two(t_cub *cl); int8_t ft_switch_weap_three(t_cub *cl); -void ft_shoot(t_cub *cl, uint16_t center); +void ft_shoot(t_cub *cl); int ft_handle_keys(uint8_t i, float old_y, float old_x, t_cub *cl); # endif diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 4e07e40..da371a6 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -184,11 +184,11 @@ enum # define FT_CHRST_MAP_ENTRY "0123456789NSEWLT!@+#e " # define FT_CHRST_SPRITES "23456789" # define FT_CHRST_SPAWN "NSEW" -# define FT_CHRST_MAP_NON_WALL "023456789NESWLT!@+#e" -# define FT_CHRST_COLLISION "123456789 " +# define FT_CHRST_MAP_NON_WALL "023456789NESWLT!@+#ex" +# define FT_CHRST_COLLISION "123456789e " # define FT_CHRST_DETECT "1L" -# define FT_CHRST_ITEM "!@+#" -# define FT_CHRST_WEAPONS "!@#" +# define FT_CHRST_ITEM "!@+#x" +# define FT_CHRST_WEAPONS "!@#x" /* ** ====== BMP ====== @@ -306,10 +306,10 @@ enum # define FT_BOUNCE_FACTOR 4 # define FT_WEAP_ONE_STRT_AMMO -4 # define FT_WEAP_TWO_STRT_AMMO 30 -# define FT_WEAP_THREE_STRT_AMMO 24 +# define FT_WEAP_THREE_STRT_AMMO 10 # define FT_WEAP_MAX_AMMO 1000 # define FT_ENMY_STRT_LIFE 10 -# define FT_ENMY_SIGHT_RANGE 5.5 +# define FT_ENMY_SIGHT_RANGE 8.5 # define FT_ENMY_DAMAGE_AMOUNT 14 # define FT_W_ONE_DANAGE_AMOUNT 5 # define FT_W_TWO_DANAGE_AMOUNT 3 diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index a97ff2d..3eabcad 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -1,9 +1,3 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* cub3d_structs.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: rbousset <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 17:20:05 by rbousset #+# #+# */ /* Updated: 2020/02/14 17:20:06 by rbousset ### ########lyon.fr */ |