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 18:49:28 +01:00
commit 8e46cb3a21
30 changed files with 320 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_map.cpp
View file

@ -6485,7 +6485,7 @@ void P_FindBelowIntersectors(AActor *actor)
void P_DoCrunch(AActor *thing, FChangePosition *cpos)
{
if (!(thing && thing->Grind(true) && cpos)) return;
if (!(thing && thing->CallGrind(true) && cpos)) return;
cpos->nofit = true;
if ((cpos->crushchange > 0) && !(level.maptime & 3))