diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-04-04 17:39:46 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-04-04 17:39:46 +0200 |
| commit | 6161b36ffd9cb5873c245951d97ea51c977fe9e6 (patch) | |
| tree | 811da882466c25a1fd311c3aaf619f5dca46839b /src | |
| parent | Selectable enemy (diff) | |
| download | 42-cub3d-6161b36ffd9cb5873c245951d97ea51c977fe9e6.tar.gz 42-cub3d-6161b36ffd9cb5873c245951d97ea51c977fe9e6.tar.bz2 42-cub3d-6161b36ffd9cb5873c245951d97ea51c977fe9e6.tar.xz 42-cub3d-6161b36ffd9cb5873c245951d97ea51c977fe9e6.tar.zst 42-cub3d-6161b36ffd9cb5873c245951d97ea51c977fe9e6.zip | |
Consitent heals
Diffstat (limited to 'src')
| -rw-r--r-- | src/ft_check_missing.c | 3 | ||||
| -rw-r--r-- | src/ft_check_missing_defines.c | 12 | ||||
| -rw-r--r-- | src/ft_tex_init.c | 18 |
3 files changed, 26 insertions, 7 deletions
diff --git a/src/ft_check_missing.c b/src/ft_check_missing.c index 2b49d2e..a0cb16f 100644 --- a/src/ft_check_missing.c +++ b/src/ft_check_missing.c @@ -30,9 +30,6 @@ static int if (ft_check_not_found(FT_WEAPON_TWO_SPR_PATH) < 0 || ft_check_ext(FT_WEAPON_TWO_SPR_PATH, ".xpm") < 0) return (ft_missing_error(FT_ERR_MISS_W_TWO_SPR, clist)); - if (ft_check_not_found(FT_HEAL_PACK_PATH) < 0 || - ft_check_ext(FT_HEAL_PACK_PATH, ".xpm") < 0) - return (ft_missing_error(FT_ERR_MISS_HEAL_PACK, clist)); i = 0; while ((i + 2) <= clist->mlist.topsp) { diff --git a/src/ft_check_missing_defines.c b/src/ft_check_missing_defines.c index 6c616b0..7994a8a 100644 --- a/src/ft_check_missing_defines.c +++ b/src/ft_check_missing_defines.c @@ -25,6 +25,18 @@ static int if (ft_check_not_found(FT_CAP_AMMO_PATH) < 0 || ft_check_ext(FT_CAP_AMMO_PATH, ".xpm") < 0) return (ft_missing_error(FT_ERR_MISS_A_CAPTION, clist)); + if (clist->mlist.enemy == 1) + { + if (ft_check_not_found(FT_HEAL_PACK_PATH) < 0 || + ft_check_ext(FT_HEAL_PACK_PATH, ".xpm") < 0) + return (ft_missing_error(FT_ERR_MISS_HEAL_PACK, clist)); + } + else + { + if (ft_check_not_found(FT_HEAL_PACK_PATH) < 0 || + ft_check_ext(FT_HEAL_PACK_PATH, ".xpm") < 0) + return (ft_missing_error(FT_ERR_MISS_HEAL_PACK, clist)); + } return (ft_check_missing_sfx(clist)); } diff --git a/src/ft_tex_init.c b/src/ft_tex_init.c index d629f76..c034ce3 100644 --- a/src/ft_tex_init.c +++ b/src/ft_tex_init.c @@ -98,10 +98,20 @@ static void } if (cl->mlist.isheals) { - cl->tlist[17].img = mlx_xpm_file_to_image(cl->wlist.wlx, - FT_HEAL_PACK_PATH, &cl->tlist[17].img_w, &cl->tlist[17].img_h); - cl->tlist[17].ptr = mlx_get_data_addr(cl->tlist[17].img, - &cl->tlist[17].bpp, &cl->tlist[17].sizeline, &cl->tlist[17].endian); + if (cl->mlist.enemy == 1) + { + cl->tlist[17].img = mlx_xpm_file_to_image(cl->wlist.wlx, + FT_HEAL_PACK_PATH, &cl->tlist[17].img_w, &cl->tlist[17].img_h); + cl->tlist[17].ptr = mlx_get_data_addr(cl->tlist[17].img, + &cl->tlist[17].bpp, &cl->tlist[17].sizeline, &cl->tlist[17].endian); + } + else + { + cl->tlist[17].img = mlx_xpm_file_to_image(cl->wlist.wlx, + FT_WHISK_PACK_PATH, &cl->tlist[17].img_w, &cl->tlist[17].img_h); + cl->tlist[17].ptr = mlx_get_data_addr(cl->tlist[17].img, + &cl->tlist[17].bpp, &cl->tlist[17].sizeline, &cl->tlist[17].endian); + } } ft_wall_tex_init_more_bonus(cl); } |