diff options
| author | Rudy Bousset <bousset.rudy@gmail.com> | 2020-05-16 14:09:18 +0200 |
|---|---|---|
| committer | Rudy Bousset <bousset.rudy@gmail.com> | 2020-05-16 14:09:18 +0200 |
| commit | e82ed3f5a4c0d338155f0dd33265f1b3511bd481 (patch) | |
| tree | 63ee8e99d52e2f49018a56ffa739a946da959285 | |
| parent | Full normed (diff) | |
| download | 42-cub3d-e82ed3f5a4c0d338155f0dd33265f1b3511bd481.tar.gz 42-cub3d-e82ed3f5a4c0d338155f0dd33265f1b3511bd481.tar.bz2 42-cub3d-e82ed3f5a4c0d338155f0dd33265f1b3511bd481.tar.xz 42-cub3d-e82ed3f5a4c0d338155f0dd33265f1b3511bd481.tar.zst 42-cub3d-e82ed3f5a4c0d338155f0dd33265f1b3511bd481.zip | |
Added Makefiles rules to start adventures
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | map/adv_one.cub | 2 | ||||
| -rw-r--r-- | src/ft_exit.c | 1 | ||||
| -rw-r--r-- | src/ft_warp_level.c | 1 |
4 files changed, 10 insertions, 4 deletions
@@ -255,8 +255,14 @@ re: fclean all #--------------------------------------------------------------------------------------------------# bonus: all #--------------------------------------------------------------------------------------------------# -run: all +quest: all @./${NAME} "map/quest_start.cub" #--------------------------------------------------------------------------------------------------# -.PHONY: all clean clean fclean re bonus run default +sergio: all + @./${NAME} "map/adv_one.cub" +#--------------------------------------------------------------------------------------------------# +soundtest: + espeak "Hello, partner" +#--------------------------------------------------------------------------------------------------# +.PHONY: all clean clean fclean re bonus quest sergio soundtest default #============================================== EOF ===============================================# diff --git a/map/adv_one.cub b/map/adv_one.cub index 916967e..faf8db0 100644 --- a/map/adv_one.cub +++ b/map/adv_one.cub @@ -1,4 +1,4 @@ -R 1200 1000 +R 1100 900 NO ./media/img/tex/BRIQUASSE_3.xpm SO ./media/img/tex/BRIQUASSE_3.xpm diff --git a/src/ft_exit.c b/src/ft_exit.c index ea43576..28e8a6f 100644 --- a/src/ft_exit.c +++ b/src/ft_exit.c @@ -87,7 +87,6 @@ int ft_del_sfx_cmd(clist); ft_del_last_remains(clist); } - ft_printf("Exiting program\n"); exit(exit_code); return (0); } diff --git a/src/ft_warp_level.c b/src/ft_warp_level.c index abbed03..cbaf3f5 100644 --- a/src/ft_warp_level.c +++ b/src/ft_warp_level.c @@ -79,6 +79,7 @@ static void { pthread_cancel(cl->mtid); pthread_join(cl->mtid, NULL); + system(FT_SND_TERM_CMD); cl->isoldmus = 0; } else if (isoldmus && cl->mlist.ismusic |