diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-04-14 19:42:39 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-04-14 19:42:39 +0200 |
| commit | a77522e3d7d3468276cc36a531d95dfbabb9cc91 (patch) | |
| tree | b84d8479f3e7e8e6c09d3d5f6adb5c1c4a0f4bbd | |
| parent | End of main src norme (diff) | |
| download | 42-cub3d-a77522e3d7d3468276cc36a531d95dfbabb9cc91.tar.gz 42-cub3d-a77522e3d7d3468276cc36a531d95dfbabb9cc91.tar.bz2 42-cub3d-a77522e3d7d3468276cc36a531d95dfbabb9cc91.tar.xz 42-cub3d-a77522e3d7d3468276cc36a531d95dfbabb9cc91.tar.zst 42-cub3d-a77522e3d7d3468276cc36a531d95dfbabb9cc91.zip | |
Headers norm
| -rw-r--r-- | inc/cub3d.h | 3 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 80 |
2 files changed, 42 insertions, 41 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index c0b324b..73c08a7 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -196,7 +196,8 @@ void ft_floor_cast_inits(uint16_t y, t_ray *rl, t_cub *cl); void ft_calc_tex(t_cub *cl); void ft_initray(uint16_t i, t_cub *cl); void ft_castray_loop(uint16_t i, t_win *wl, t_cub *cl); -void ft_set_fc_tex_xy(uint8_t tid, uint16_t x, uint16_t y, t_cub *cl); +void ft_set_fc_tex_xy(uint8_t tid, uint16_t x, + uint16_t y, t_cub *cl); void ft_floor_loop(uint16_t y, t_cub *cl); void ft_floor_cast_loop(uint16_t y, uint16_t x, t_cub *cl); diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 73b600d..1fa2da0 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -95,45 +95,45 @@ enum */ # 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_SFX_HEAL_PATH "./media/sound/sfx/heal.wav" -# define FT_SFX_W_ONE_LOAD_PATH "./media/sound/sfx/sword_load.wav" -# define FT_SFX_W_ONE_FIRE_PATH "./media/sound/sfx/sword_fire.wav" -# define FT_SFX_W_TWO_LOAD_PATH "./media/sound/sfx/colt_load.wav" -# define FT_SFX_W_TWO_FIRE_PATH "./media/sound/sfx/colt_fire.wav" -# define FT_SFX_W_THREE_LOAD_PATH "./media/sound/sfx/double_b_load.wav" -# define FT_SFX_W_THREE_FIRE_PATH "./media/sound/sfx/double_b_fire.wav" -# define FT_SFX_OOA_PATH "./media/sound/sfx/ooa.wav" -# define FT_SFX_ENMY_DEATH_PATH "./media/sound/sfx/skel_death.wav" -# define FT_SFX_ENMY_SCR_ONE_PATH "./media/sound/sfx/skel_scream_one.wav" -# define FT_SFX_ENMY_SCR_TWO_PATH "./media/sound/sfx/skel_scream_two.wav" -# define FT_SFX_ENMY_FIRE_PATH "./media/sound/sfx/skel_gun.wav" -# define FT_DEATH_SCREEN_PATH "./media/img/screens/death_screen.xpm" -# define FT_HUD_BACK_PATH "./media/img/hud/hud_back_small.xpm" -# define FT_WEAPON_ONE_SPR_PATH "./media/img/weapons/sword_s.xpm" -# define FT_WEAPON_TWO_SPR_PATH "./media/img/weapons/colt_s.xpm" -# define FT_WEAPON_THREE_SPR_PATH "./media/img/weapons/double_b_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/colt_w.xpm" -# 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/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/heal_pot.xpm" -# define FT_WHISK_PACK_PATH "./media/img/sprites/sr_hp.xpm" +# 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_SFX_HEAL_PATH "./media/sound/sfx/heal.wav" +# define FT_SFX_W_ONE_LOAD_PATH "./media/sound/sfx/sword_load.wav" +# define FT_SFX_W_ONE_FIRE_PATH "./media/sound/sfx/sword_fire.wav" +# define FT_SFX_W_TWO_LOAD_PATH "./media/sound/sfx/colt_load.wav" +# define FT_SFX_W_TWO_FIRE_PATH "./media/sound/sfx/colt_fire.wav" +# define FT_SFX_W_THREE_LOAD_PATH "./media/sound/sfx/double_b_load.wav" +# define FT_SFX_W_THREE_FIRE_PATH "./media/sound/sfx/double_b_fire.wav" +# define FT_SFX_OOA_PATH "./media/sound/sfx/ooa.wav" +# define FT_SFX_ENMY_DEATH_PATH "./media/sound/sfx/skel_death.wav" +# define FT_SFX_ENMY_SCR_ONE_PATH "./media/sound/sfx/skel_scream_one.wav" +# define FT_SFX_ENMY_SCR_TWO_PATH "./media/sound/sfx/skel_scream_two.wav" +# define FT_SFX_ENMY_FIRE_PATH "./media/sound/sfx/skel_gun.wav" +# define FT_DEATH_SCREEN_PATH "./media/img/screens/death_screen.xpm" +# define FT_HUD_BACK_PATH "./media/img/hud/hud_back_small.xpm" +# define FT_WEAPON_ONE_SPR_PATH "./media/img/weapons/sword_s.xpm" +# define FT_WEAPON_TWO_SPR_PATH "./media/img/weapons/colt_s.xpm" +# define FT_WEAPON_THREE_SPR_PATH "./media/img/weapons/double_b_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/colt_w.xpm" +# 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/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/heal_pot.xpm" +# define FT_WHISK_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" # define FT_TWO_PATH "./media/img/hud/two.xpm" @@ -231,7 +231,7 @@ enum # define FT_ERR_MULT_SPAWN "multiple spawn points" # define FT_ERR_MULT_NLVL "multiple new level access points" # define FT_ERR_NO_MAP "No map" -# define FT_ERR_MAP_WALLS "bad space or map is not surrounded by walls" +# define FT_ERR_MAP_WALLS "bad space or map isn't surrounded by walls" # define FT_ERR_MAP_EMPL "empty line in map" # define FT_ERR_MAP_L_L "last line is invalid" # define FT_ERR_RD_NO "could not find north side texture file" |