diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-05 22:39:42 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-05 22:39:42 +0100 |
| commit | 059768825bcf68e181d70a5d5a119360db5360dc (patch) | |
| tree | 01fbbde43c28e3cdbdf6748565a942df97c72aba /src | |
| parent | Back to shadows walls only (diff) | |
| download | 42-cub3d-059768825bcf68e181d70a5d5a119360db5360dc.tar.gz 42-cub3d-059768825bcf68e181d70a5d5a119360db5360dc.tar.bz2 42-cub3d-059768825bcf68e181d70a5d5a119360db5360dc.tar.xz 42-cub3d-059768825bcf68e181d70a5d5a119360db5360dc.tar.zst 42-cub3d-059768825bcf68e181d70a5d5a119360db5360dc.zip | |
Back to when it worked
Diffstat (limited to '')
| -rw-r--r-- | src/ft_exit.c | 5 | ||||
| -rw-r--r-- | src/ft_warp_level.c | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/ft_exit.c b/src/ft_exit.c index 6726fb1..ca5201c 100644 --- a/src/ft_exit.c +++ b/src/ft_exit.c @@ -68,10 +68,7 @@ int if (clist->isoldmus && clist->wlist.inited) { pthread_cancel(clist->tid); - if (FT_OS == 2) - pthread_join(clist->tid, NULL); - else - pthread_kill(clist->tid, SIGTERM); + pthread_join(clist->tid, NULL); } ft_free_lists(clist); ft_printf("Exiting program\n"); diff --git a/src/ft_warp_level.c b/src/ft_warp_level.c index cda89b0..808b346 100644 --- a/src/ft_warp_level.c +++ b/src/ft_warp_level.c @@ -67,20 +67,14 @@ static void if (isoldmus && !cl->mlist.ismusic) { pthread_cancel(cl->tid); - if (FT_OS == 2) - pthread_join(cl->tid, NULL); - else - pthread_kill(cl->tid, SIGTERM); + pthread_join(cl->tid, NULL); cl->isoldmus = 0; } else if (isoldmus && cl->mlist.ismusic && ft_strncmp(tmp_mup, cl->mlist.music_path, ft_strlen(tmp_mup) + 1)) { pthread_cancel(cl->tid); - if (FT_OS == 2) - pthread_join(cl->tid, NULL); - else - pthread_kill(cl->tid, SIGTERM); + pthread_join(cl->tid, NULL); pthread_create(&cl->tid, NULL, ft_music_thread, cl); } else if (isoldmus && cl->mlist.ismusic |