From d1d68677a2b7040d03f33a4e753f1cb5f19070d2 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Wed, 18 Mar 2020 20:14:17 +0100 Subject: Checked missings for weaps --- inc/cub3d_defines.h | 28 +++++++++++++++++----------- src/ft_check_missing.c | 12 ++++++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 15ff3b5..1fb5c40 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -85,17 +85,19 @@ enum ** ====== NEEDED PATHS ====== */ -# define FT_SFX_DEATH_PATH "./media/sound/sfx/death_screen.wav" -# define FT_SFX_FS_ONE_PATH "./media/sound/sfx/footstep_one.wav" -# define FT_SFX_FS_TWO_PATH "./media/sound/sfx/footstep_two.wav" -# define FT_SFX_N_LVL_PATH "./media/sound/sfx/next_lvl.wav" -# define FT_SFX_SCR_ONE_PATH "./media/sound/sfx/scream_one.wav" -# define FT_SFX_SCR_TWO_PATH "./media/sound/sfx/scream_two.wav" -# 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_PATH "./media/img/weapons/sword_w.xpm" -# define FT_WEAPON_TWO_PATH "./media/img/weapons/sword_w.xpm" +# define FT_SFX_DEATH_PATH "./media/sound/sfx/death_screen.wav" +# define FT_SFX_FS_ONE_PATH "./media/sound/sfx/footstep_one.wav" +# define FT_SFX_FS_TWO_PATH "./media/sound/sfx/footstep_two.wav" +# define FT_SFX_N_LVL_PATH "./media/sound/sfx/next_lvl.wav" +# define FT_SFX_SCR_ONE_PATH "./media/sound/sfx/scream_one.wav" +# define FT_SFX_SCR_TWO_PATH "./media/sound/sfx/scream_two.wav" +# 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_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" +# define FT_WEAPON_TWO_FIRE_PATH "./media/img/weapons/sword_w_fire.xpm" /* ** ====== SOUNDS ====== @@ -215,6 +217,10 @@ enum # define FT_ERR_MISS_SFX_TRAP "missing sound effect trap" # define FT_ERR_MISS_DEATH_SCREEN "missing death screen image" # define FT_ERR_MISS_HUD_BACK "missing HUD background image" +# define FT_ERR_MISS_W_ONE "missing HUD background image" +# define FT_ERR_MISS_W_ONE_FIRE "missing HUD background image" +# define FT_ERR_MISS_W_TWO "missing HUD background image" +# define FT_ERR_MISS_W_TWO_FIRE "missing HUD background image" /* ** ====== OTHER ====== diff --git a/src/ft_check_missing.c b/src/ft_check_missing.c index 4d06276..5498058 100644 --- a/src/ft_check_missing.c +++ b/src/ft_check_missing.c @@ -59,6 +59,18 @@ static int if (ft_check_not_found(FT_HUD_BACK_PATH) < 0 || ft_check_ext(FT_HUD_BACK_PATH, ".xpm") < 0) return (ft_missing_error(FT_ERR_MISS_HUD_BACK, clist)); + if (ft_check_not_found(FT_WEAPON_ONE_PATH) < 0 || + ft_check_ext(FT_WEAPON_ONE_PATH, ".xpm") < 0) + return (ft_missing_error(FT_ERR_MISS_W_ONE, clist)); + if (ft_check_not_found(FT_WEAPON_TWO_PATH) < 0 || + ft_check_ext(FT_WEAPON_TWO_PATH, ".xpm") < 0) + return (ft_missing_error(FT_ERR_MISS_W_TWO, clist)); + if (ft_check_not_found(FT_WEAPON_ONE_FIRE_PATH) < 0 || + ft_check_ext(FT_WEAPON_ONE_FIRE_PATH, ".xpm") < 0) + return (ft_missing_error(FT_ERR_MISS_W_ONE_FIRE, clist)); + if (ft_check_not_found(FT_WEAPON_TWO_FIRE_PATH) < 0 || + ft_check_ext(FT_WEAPON_TWO_FIRE_PATH, ".xpm") < 0) + return (ft_missing_error(FT_ERR_MISS_W_TWO_FIRE, clist)); return (ft_check_missing_sprites(clist)); } -- cgit v1.2.3