diff --git a/src/p_setup.c b/src/p_setup.c index a1c96bed3f52d39ae4f82eb0bb3168de5c0e78cf..8ec5672d24f2f19790bf78d311a23545864db331 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -1250,7 +1250,7 @@ static void P_LoadSidedefs(UINT8 *data) sd->midtexture = get_number(process); } - sd->text = Z_Malloc(7, PU_LEVEL, NULL); + sd->text = Z_Malloc(7, PU_LEVEL, NULL); if (isfrontside && !(msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')) { M_Memcpy(process,msd->toptexture,8); diff --git a/src/s_sound.c b/src/s_sound.c index 7e61e8a5585843240f5da219ab726157d35232a6..fc5f51da797e572b6a57ad4690440218f5ec88fd 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2259,9 +2259,9 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 return; newmusic[6] = 0; - // No Music (empty string) + // No Music (empty string) if (newmusic[0] == 0) - { + { if (prefadems) I_FadeSong(0, prefadems, &S_StopMusic); else @@ -2279,7 +2279,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 } else if (strnicmp(music_name, newmusic, 6) || (mflags & MUSIC_FORCERESET) || (midipref != currentmidi && S_PrefAvailable(midipref, newmusic))) - { + { CONS_Debug(DBG_DETAILED, "Now playing song %s\n", newmusic); S_StopMusic(); @@ -2302,7 +2302,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 { I_SetSongPosition(position); I_FadeSong(100, fadeinms, NULL); - } +} else // reset volume to 100 with same music { I_StopFadingSong();