zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 23:12:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2016-12-27 12:21:15 -05:00
commit bad3a130cf
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_map.cpp
View file

@ -455,6 +455,10 @@ bool P_TeleportMove(AActor* thing, const DVector3 &pos, bool telefrag, bool modi
if (!P_CanCollideWith(tmf.thing, th)) if (!P_CanCollideWith(tmf.thing, th))
continue; continue;
// Don't let players and monsters block item teleports (all other actor types will still block.)
if (thing->IsKindOf(RUNTIME_CLASS(AInventory)) && !(thing->flags & MF_SOLID) && ((th->flags3 & MF3_ISMONSTER) || th->player != nullptr))
continue;
// monsters don't stomp things except on boss level // monsters don't stomp things except on boss level
// [RH] Some Heretic/Hexen monsters can telestomp // [RH] Some Heretic/Hexen monsters can telestomp
// ... and some items can never be telefragged while others will be telefragged by everything that teleports upon them. // ... and some items can never be telefragged while others will be telefragged by everything that teleports upon them.

7
src/sound/i_music.cpp
View file

@ -227,7 +227,12 @@ void MusInfo::Start(bool loop, float rel_vol, int subsong)
{ {
if (nomusic) return; if (nomusic) return;
if (rel_vol > 0.f) saved_relative_volume = relative_volume = rel_vol; if (rel_vol > 0.f)
{
float factor = relative_volume / saved_relative_volume;
saved_relative_volume = rel_vol;
relative_volume = saved_relative_volume * factor;
}
Stop (); Stop ();
Play (loop, subsong); Play (loop, subsong);
m_NotStartedYet = false; m_NotStartedYet = false;