diff options
Diffstat (limited to '')
| -rw-r--r-- | inc/cub3d_defines.h | 5 | ||||
| -rw-r--r-- | map/lvl_five.cub | 8 | ||||
| -rw-r--r-- | map/lvl_four.cub | 4 | ||||
| -rw-r--r-- | map/map_five.cub | 2 | ||||
| -rw-r--r-- | src/ft_suffer_animation.c | 4 |
5 files changed, 12 insertions, 11 deletions
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index c4c3a13..f5824ce 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -232,7 +232,8 @@ enum ** ====== OTHER ====== */ -# define FT_PARSE_END_RET 25 -# define FT_HEAL_PACK_AMOUNT 10 +# define FT_PARSE_END_RET 25 +# define FT_TRAP_DAMAGE_AMOUNT 20 +# define FT_HEAL_PACK_AMOUNT 10 # endif diff --git a/map/lvl_five.cub b/map/lvl_five.cub index 9d7cd2b..204a814 100644 --- a/map/lvl_five.cub +++ b/map/lvl_five.cub @@ -17,17 +17,17 @@ SH 16 MU ./media/sound/BITURE-ET-MELANCOLIE.wav 111111111111111111111111111111 -1T0000000000000000000000000001 +1T00000000000000000000000000+1 11111101111110110111111110111111 1111101 101T01 10000001 1000001 11101101 1111110111111 - 11T1101 10000001 1T00000000001 - 101101 111111101 1111111111101 + 11T1101 1+000001 1T00000000001 + 1+1101 111111101 1111111111101 111101 101 101 1000001 101 1011101 101 1011101 101 11110000011111N1 101T001 101 1011011111101111 10111111101 - 101101 1L0011 10000000001 + 101101 1L0011 1+000000001 100001 110111111111111111101 101101 11110000000000000000001 101101 1011111111111T011111101 diff --git a/map/lvl_four.cub b/map/lvl_four.cub index 04b4bdd..4e5de39 100644 --- a/map/lvl_four.cub +++ b/map/lvl_four.cub @@ -27,10 +27,10 @@ L ./map/lvl_five.cub 101 1110111 101 11000TT11 101 11101111111 - 101 1000000000001 + 101 1+000000000+1 101 11111T111111011 101 11111111111T10111 - 101 1100000000000000001 + 101 11+00000000000000+1 101 111111111110111111111 101 1E0000000000000000000T1 101 1111111111111111111110111 diff --git a/map/map_five.cub b/map/map_five.cub index e52646c..b92f4e3 100644 --- a/map/map_five.cub +++ b/map/map_five.cub @@ -8,7 +8,7 @@ S ./media/img/tex/crapaud.xpm F ./media/img/tex/terre.xpm C 225,30,0 -LT ./media/img/linuz.xpm +LT ./media/img/tex/linuz.xpm L ./map/map_two.cub SH 4 diff --git a/src/ft_suffer_animation.c b/src/ft_suffer_animation.c index a0a21a5..7229769 100644 --- a/src/ft_suffer_animation.c +++ b/src/ft_suffer_animation.c @@ -36,7 +36,7 @@ void mlx_put_image_to_window(cl->wlist.wlx, cl->wlist.winptr, cl->img.img, 0, 0); mlx_destroy_image(cl->wlist.wlx, cl->img.img); - cl->plist.life -= 20; + cl->plist.life -= FT_TRAP_DAMAGE_AMOUNT; if (cl->plist.life <= 0) { ft_sfx_death(cl); @@ -71,7 +71,7 @@ void (x * 4 + (y * cl->img.sizeline))) = ft_rgb_to_hex(rgb); } } - cl->plist.life -= 20; + cl->plist.life -= FT_TRAP_DAMAGE_AMOUNT; if (cl->plist.life <= 0) { ft_sfx_death(cl); |