diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-19 20:25:54 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-19 20:25:54 +0100 |
| commit | 5798c414690561950b53a3c9f9478891e75ec91f (patch) | |
| tree | c068cea671eb4c80fefbebcee35460481afe8e5f /src | |
| parent | Now making second weapon (diff) | |
| download | 42-cub3d-5798c414690561950b53a3c9f9478891e75ec91f.tar.gz 42-cub3d-5798c414690561950b53a3c9f9478891e75ec91f.tar.bz2 42-cub3d-5798c414690561950b53a3c9f9478891e75ec91f.tar.xz 42-cub3d-5798c414690561950b53a3c9f9478891e75ec91f.tar.zst 42-cub3d-5798c414690561950b53a3c9f9478891e75ec91f.zip | |
New images, that'll do the trick
Diffstat (limited to '')
| -rw-r--r-- | src/ft_init_lists.c | 3 | ||||
| -rw-r--r-- | src/ft_suffer_animation.c | 5 | ||||
| -rw-r--r-- | src/ft_warp_level.c | 23 |
3 files changed, 29 insertions, 2 deletions
diff --git a/src/ft_init_lists.c b/src/ft_init_lists.c index 4eccf01..b876e8d 100644 --- a/src/ft_init_lists.c +++ b/src/ft_init_lists.c @@ -50,10 +50,10 @@ t_player plist.dir_y = 0; plist.plane_x = 0; plist.plane_y = 0.66; - plist.life = 100; plist.has_weapon[0] = 0; plist.has_weapon[1] = 0; plist.handles_weapon = -1; + plist.life = 100; plist.fire = 0; return (plist); } @@ -109,5 +109,6 @@ int8_t if (ft_init_win(&clist->wlist) < 0) return (-1); ft_sprintf(clist->fps_count, "fps: 60"); + clist->isdead = 0; return (0); } diff --git a/src/ft_suffer_animation.c b/src/ft_suffer_animation.c index 7229769..9ee7882 100644 --- a/src/ft_suffer_animation.c +++ b/src/ft_suffer_animation.c @@ -39,6 +39,7 @@ void cl->plist.life -= FT_TRAP_DAMAGE_AMOUNT; if (cl->plist.life <= 0) { + cl->isdead = 1; ft_sfx_death(cl); ft_death_screen(cl); } @@ -74,10 +75,14 @@ void cl->plist.life -= FT_TRAP_DAMAGE_AMOUNT; if (cl->plist.life <= 0) { + cl->isdead = 1; ft_sfx_death(cl); ft_death_screen(cl); } else + { ft_sfx_trap(cl); + ft_sfx_pain(cl); + } cl->doicast = 0; } diff --git a/src/ft_warp_level.c b/src/ft_warp_level.c index 6962a1d..4618766 100644 --- a/src/ft_warp_level.c +++ b/src/ft_warp_level.c @@ -42,11 +42,32 @@ static void } static void + ft_player_keepings(t_cub *cl) +{ + int8_t tmp_life; + uint8_t tmp_has[2]; + int8_t tmp_handles; + + tmp_life = cl->plist.life; + tmp_has[0] = cl->plist.has_weapon[0]; + tmp_has[1] = cl->plist.has_weapon[1]; + tmp_handles = cl->plist.handles_weapon; + cl->plist = ft_init_player(); + if (!cl->isdead) + cl->plist.life = tmp_life; + else + cl->isdead = 0; + cl->plist.has_weapon[0] = tmp_has[0]; + cl->plist.has_weapon[1] = tmp_has[1]; + cl->plist.handles_weapon = tmp_handles; +} + +static void ft_del_some(t_cub *cl) { int8_t i; - cl->plist = ft_init_player(); + ft_player_keepings(cl); cl->f_rgb = ft_init_rgb(); cl->c_rgb = ft_init_rgb(); cl->rlist = ft_init_s_ray(); |