OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source 
# Conflicts:
#	src/posix/cocoa/i_video.mm
This commit is contained in:
Rachael Alexanderson 2017-04-30 22:16:01 -04:00
commit ebf33ed24e
23 changed files with 1295 additions and 1243 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/p_mobj.cpp
View file

@ -3270,6 +3270,14 @@ void P_CheckFakeFloorTriggers (AActor *mo, double oldz, bool oldz_has_viewheight
}
}
DEFINE_ACTION_FUNCTION(AActor, CheckFakeFloorTriggers)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_FLOAT(oldz);
PARAM_BOOL_DEF(oldz_has_viewh);
P_CheckFakeFloorTriggers(self, oldz, oldz_has_viewh);
return 0;
}
//===========================================================================
//
// PlayerLandedOnThing