diff options
author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-22 20:36:04 +0100 |
---|---|---|
committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-22 20:36:04 +0100 |
commit | 1a9a3fc486195d7e1cb88bd67e69b58deb8057b9 (patch) | |
tree | dd1cc7dc4dd38845d605e9c390d9f30b30221a88 | |
parent | We got three weaps (diff) | |
download | 42-cub3d-1a9a3fc486195d7e1cb88bd67e69b58deb8057b9.tar.gz 42-cub3d-1a9a3fc486195d7e1cb88bd67e69b58deb8057b9.tar.bz2 42-cub3d-1a9a3fc486195d7e1cb88bd67e69b58deb8057b9.tar.xz 42-cub3d-1a9a3fc486195d7e1cb88bd67e69b58deb8057b9.tar.zst 42-cub3d-1a9a3fc486195d7e1cb88bd67e69b58deb8057b9.zip |
Ok great
Diffstat (limited to '')
-rw-r--r-- | map/lvl_five.cub | 4 | ||||
-rw-r--r-- | map/lvl_four.cub | 2 | ||||
-rw-r--r-- | map/lvl_three.cub | 2 | ||||
-rw-r--r-- | map/lvl_two.cub | 2 | ||||
-rw-r--r-- | src/ft_warp_level.c | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/map/lvl_five.cub b/map/lvl_five.cub index 204a814..bb7ef45 100644 --- a/map/lvl_five.cub +++ b/map/lvl_five.cub @@ -1,4 +1,4 @@ -R 1600 1050 +R 10 10 NO ./media/img/tex/plate_small.xpm SO ./media/img/tex/plate_small.xpm @@ -21,7 +21,7 @@ MU ./media/sound/BITURE-ET-MELANCOLIE.wav 11111101111110110111111110111111 1111101 101T01 10000001 1000001 11101101 1111110111111 - 11T1101 1+000001 1T00000000001 + 11T1101 1+#00001 1T00000000001 1+1101 111111101 1111111111101 111101 101 101 1000001 101 1011101 101 1011101 101 diff --git a/map/lvl_four.cub b/map/lvl_four.cub index 3930581..4399923 100644 --- a/map/lvl_four.cub +++ b/map/lvl_four.cub @@ -1,4 +1,4 @@ -R 1800 1200 +R 10 10 NO ./media/img/tex/arrow1.xpm SO ./media/img/tex/arrow2.xpm diff --git a/map/lvl_three.cub b/map/lvl_three.cub index 260c8fe..e4ea8c7 100644 --- a/map/lvl_three.cub +++ b/map/lvl_three.cub @@ -1,4 +1,4 @@ -R 500 500 +R 10 10 NO ./media/img/tex/brickwall.xpm SO ./media/img/tex/brickwall.xpm diff --git a/map/lvl_two.cub b/map/lvl_two.cub index eca32cf..a91624c 100644 --- a/map/lvl_two.cub +++ b/map/lvl_two.cub @@ -1,4 +1,4 @@ -R 500 500 +R 10 10 NO ./media/img/tex/BRIQUASSE_3.xpm SO ./media/img/tex/BRIQUASSE_3.xpm diff --git a/src/ft_warp_level.c b/src/ft_warp_level.c index 5418a86..02911b0 100644 --- a/src/ft_warp_level.c +++ b/src/ft_warp_level.c @@ -22,18 +22,20 @@ static void ft_player_keepings(t_cub *cl) { int16_t tmp_life; - uint8_t tmp_has[2]; + uint8_t tmp_has[3]; 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_has[2] = cl->plist.has_weapon[2]; tmp_handles = cl->plist.handles_weapon; cl->plist = ft_init_player(); if (!cl->isdead) cl->plist.life = tmp_life; cl->plist.has_weapon[0] = tmp_has[0]; cl->plist.has_weapon[1] = tmp_has[1]; + cl->plist.has_weapon[2] = tmp_has[2]; cl->plist.handles_weapon = tmp_handles; } |