OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/origin/master' into asmjit

Browse source
This commit is contained in:
Christoph Oelckers 2018-11-30 21:29:12 +01:00
commit b26b16e4b7
7 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_map.cpp
View file

@ -3570,9 +3570,9 @@ bool FSlide::BounceWall(AActor *mo)
}
line = bestslideline;
if (line->special == Line_Horizon)
if (line->special == Line_Horizon || (mo->BounceFlags & BOUNCE_NotOnSky) && line->hitSkyWall(mo))
{
mo->SeeSound = 0; // it might make a sound otherwise
mo->SeeSound = mo->BounceSound = 0; // it might make a sound otherwise
mo->Destroy();
return true;
}