diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-05-13 20:27:59 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-05-13 20:27:59 +0200 |
| commit | 252b3d8641eb689d7f97760ec9418b729628f6c5 (patch) | |
| tree | 11e59b2d8948c2cfe2e1e0999b82b16ff5670cd5 | |
| parent | Might lock mouse (diff) | |
| download | 42-cub3d-252b3d8641eb689d7f97760ec9418b729628f6c5.tar.gz 42-cub3d-252b3d8641eb689d7f97760ec9418b729628f6c5.tar.bz2 42-cub3d-252b3d8641eb689d7f97760ec9418b729628f6c5.tar.xz 42-cub3d-252b3d8641eb689d7f97760ec9418b729628f6c5.tar.zst 42-cub3d-252b3d8641eb689d7f97760ec9418b729628f6c5.zip | |
Fuckiest fucked bug fix
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 10 | ||||
| -rw-r--r-- | map/lvl_two.cub | 1 | ||||
| -rw-r--r-- | src/ft_warp_level.c | 2 |
4 files changed, 8 insertions, 7 deletions
@@ -170,7 +170,7 @@ CFLAGS += -Wall CFLAGS += -Wextra CFLAGS += -Werror CFLAGS += -pedantic -CFLAGS += -pthread +# CFLAGS += -pthread #--------------------------------------------------------------------------------------------------# ifdef DEBUG CFLAGS += ${DBG} diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 5d5003c..6da77ce 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -158,19 +158,19 @@ enum # define FT_SND_CMD "/usr/bin/afplay --volume 0.2 %s" # endif # if FT_OS == 2 -# define FT_SND_CMD "/usr/bin/aplay -f cd -t wav -q %s >/dev/null 2>&1" +# define FT_SND_CMD "/usr/bin/aplay -f cd -t wav -q %s" # endif # if FT_OS == 3 -# define FT_SND_CMD "/usr/local/bin/waveplay -s %s >/dev/null 2>&1" +# define FT_SND_CMD "/usr/local/bin/waveplay -s %s" # endif # if FT_OS == 1 -# define FT_SND_TERM_CMD "pkill -SIGTERM afplay >/dev/null 2>&1" +# define FT_SND_TERM_CMD "pkill -SIGTERM afplay" # endif # if FT_OS == 2 -# define FT_SND_TERM_CMD "pkill -SIGTERM aplay >/dev/null 2>&1" +# define FT_SND_TERM_CMD "pkill -SIGTERM aplay" # endif # if FT_OS == 3 -# define FT_SND_TERM_CMD "pkill -SIGTERM waveplay >/dev/null 2>&1" +# define FT_SND_TERM_CMD "pkill -SIGTERM waveplay" # endif /* diff --git a/map/lvl_two.cub b/map/lvl_two.cub index 103c251..ff17765 100644 --- a/map/lvl_two.cub +++ b/map/lvl_two.cub @@ -16,7 +16,6 @@ L ./map/lvl_three.cub LT ./media/img/tex/crapaud.xpm T ./media/img/sprites/spikes.xpm -MU ./media/sound/BITURE-ET-MELANCOLIE.wav 111 11211 diff --git a/src/ft_warp_level.c b/src/ft_warp_level.c index bc56433..f69ec42 100644 --- a/src/ft_warp_level.c +++ b/src/ft_warp_level.c @@ -91,6 +91,8 @@ static void else if (isoldmus && cl->mlist.ismusic && !ft_strncmp(tmp_mup, cl->mlist.music_path, ft_strlen(tmp_mup) + 1)) return ; + else if (!isoldmus && cl->mlist.ismusic) + ft_enable_music(cl); } int8_t |