diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 3f89a31fd..a147e836c 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -8210,7 +8210,7 @@ void P_LoadLevelMusic(void) { const char *music = mapheaderinfo[gamemap-1]->musname[mapmusrng]; - if (gametyperules & GTR_NOPOSITION) + if (gametyperules & GTR_NOPOSITION || modeattacking != ATTACKING_NONE) { if (!stricmp(Music_Song("level_nosync"), music)) { diff --git a/src/p_tick.c b/src/p_tick.c index 864971471..2815f16b7 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -1039,7 +1039,18 @@ void P_Ticker(boolean run) } // POSITION!! music - P_StartPositionMusic(true); // exact times only + if (modeattacking == ATTACKING_NONE) + { + P_StartPositionMusic(true); // exact times only + } + } + } + + if (modeattacking != ATTACKING_NONE) + { + if (leveltime == 4 && !Music_Playing("level_nosync")) + { + Music_Play("level_nosync"); } }