diff options
| -rw-r--r-- | inc/cub3d_defines.h | 62 | ||||
| -rw-r--r-- | media/sound/sfx/weapon_two_load.wav | bin | 0 -> 54956 bytes | |||
| -rw-r--r-- | src/ft_check_missing.c | 12 |
3 files changed, 47 insertions, 27 deletions
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 25f24cd..0d8c37f 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -93,6 +93,10 @@ enum # 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_SFX_W_ONE_LOAD_PATH "./media/sound/sfx/weapon_two_load.wav" +# define FT_SFX_W_ONE_FIRE_PATH "./media/sound/sfx/weapon_two_load.wav" +# define FT_SFX_W_TWO_LOAD_PATH "./media/sound/sfx/weapon_two_load.wav" +# define FT_SFX_W_TWO_FIRE_PATH "./media/sound/sfx/weapon_two_load.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" @@ -206,33 +210,37 @@ enum ** ====== MISSING ERROR MSG ====== */ -# define FT_ERR_MISS_ELEMENT "Missing element:" -# define FT_ERR_MISS_NORTH "north side texture" -# define FT_ERR_MISS_SOUTH "south side texture" -# define FT_ERR_MISS_EAST "east side texture" -# define FT_ERR_MISS_WEST "west side texture" -# define FT_ERR_MISS_SPRITE "sprite texture" -# define FT_ERR_MISS_NLVL_PATH "next level path" -# define FT_ERR_MISS_NLVL "next level texture" -# define FT_ERR_MISS_RESOLUTION "resolution" -# define FT_ERR_MISS_FLOOR_C "floor color" -# define FT_ERR_MISS_CEIL_C "ceiling color" -# define FT_ERR_MISS_PLAYER_SPAWN "player spawn" -# define FT_ERR_MISS_TRAP "traps" -# define FT_ERR_MISS_SFX_DEATH "sound effect death" -# define FT_ERR_MISS_SFX_N_LVL "sound effect new level" -# define FT_ERR_MISS_SFX_SCR_ONE "sound effect scream one" -# define FT_ERR_MISS_SFX_SCR_TWO "sound effect scream two" -# define FT_ERR_MISS_SFX_TRAP "sound effect trap" -# define FT_ERR_MISS_DEATH_SCREEN "death screen image" -# define FT_ERR_MISS_HUD_BACK "HUD background image" -# define FT_ERR_MISS_HEAL_PACK "heal pack image" -# define FT_ERR_MISS_W_ONE "weapon one image" -# 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" +# define FT_ERR_MISS_ELEMENT "Missing element:" +# define FT_ERR_MISS_NORTH "north side texture" +# define FT_ERR_MISS_SOUTH "south side texture" +# define FT_ERR_MISS_EAST "east side texture" +# define FT_ERR_MISS_WEST "west side texture" +# define FT_ERR_MISS_SPRITE "sprite texture" +# define FT_ERR_MISS_NLVL_PATH "next level path" +# define FT_ERR_MISS_NLVL "next level texture" +# define FT_ERR_MISS_RESOLUTION "resolution" +# define FT_ERR_MISS_FLOOR_C "floor color" +# define FT_ERR_MISS_CEIL_C "ceiling color" +# define FT_ERR_MISS_PLAYER_SPAWN "player spawn" +# define FT_ERR_MISS_TRAP "traps" +# define FT_ERR_MISS_SFX_DEATH "sound effect death" +# define FT_ERR_MISS_SFX_N_LVL "sound effect new level" +# define FT_ERR_MISS_SFX_SCR_ONE "sound effect scream one" +# define FT_ERR_MISS_SFX_SCR_TWO "sound effect scream two" +# define FT_ERR_MISS_SFX_TRAP "sound effect trap" +# define FT_ERR_MISS_SFX_W_ONE_LOAD "sound effect weapon one load" +# define FT_ERR_MISS_SFX_W_ONE_FIRE "sound effect weapon one fire" +# define FT_ERR_MISS_SFX_W_TWO_LOAD "sound effect weapon two load" +# define FT_ERR_MISS_SFX_W_TWO_FIRE "sound effect weapon two fire" +# define FT_ERR_MISS_DEATH_SCREEN "death screen image" +# define FT_ERR_MISS_HUD_BACK "HUD background image" +# define FT_ERR_MISS_HEAL_PACK "heal pack image" +# define FT_ERR_MISS_W_ONE "weapon one image" +# 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/media/sound/sfx/weapon_two_load.wav b/media/sound/sfx/weapon_two_load.wav Binary files differnew file mode 100644 index 0000000..ce35094 --- /dev/null +++ b/media/sound/sfx/weapon_two_load.wav diff --git a/src/ft_check_missing.c b/src/ft_check_missing.c index 4b4a3ef..8619c9d 100644 --- a/src/ft_check_missing.c +++ b/src/ft_check_missing.c @@ -32,6 +32,18 @@ static int if (ft_check_not_found(FT_SFX_TRAP_PATH) < 0 || ft_check_ext(FT_SFX_TRAP_PATH, ".wav") < 0) return (ft_missing_error(FT_ERR_MISS_SFX_TRAP, clist)); + if (ft_check_not_found(FT_SFX_W_ONE_LOAD_PATH) < 0 || + ft_check_ext(FT_SFX_W_ONE_LOAD_PATH, ".wav") < 0) + return (ft_missing_error(FT_ERR_MISS_SFX_W_ONE_LOAD, clist)); + if (ft_check_not_found(FT_SFX_W_ONE_FIRE_PATH) < 0 || + ft_check_ext(FT_SFX_W_ONE_FIRE_PATH, ".wav") < 0) + return (ft_missing_error(FT_ERR_MISS_SFX_W_ONE_FIRE, clist)); + if (ft_check_not_found(FT_SFX_W_TWO_LOAD_PATH) < 0 || + ft_check_ext(FT_SFX_W_TWO_LOAD_PATH, ".wav") < 0) + return (ft_missing_error(FT_ERR_MISS_SFX_W_TWO_LOAD, clist)); + if (ft_check_not_found(FT_SFX_W_TWO_FIRE_PATH) < 0 || + ft_check_ext(FT_SFX_W_TWO_FIRE_PATH, ".wav") < 0) + return (ft_missing_error(FT_ERR_MISS_SFX_W_TWO_FIRE, clist)); return (0); } |