OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added a 'nocheck' parameter to A_Raise* and Thing_Raise.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-26 17:50:48 +01:00
commit c4b546404a
7 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_things.cpp
View file

@ -406,7 +406,7 @@ void P_RemoveThing(AActor * actor)
}
bool P_Thing_Raise(AActor *thing, AActor *raiser)
bool P_Thing_Raise(AActor *thing, AActor *raiser, int nocheck)
{
FState * RaiseState = thing->GetRaiseState();
if (RaiseState == NULL)
@ -426,7 +426,7 @@ bool P_Thing_Raise(AActor *thing, AActor *raiser)
thing->flags |= MF_SOLID;
thing->Height = info->Height; // [RH] Use real height
thing->radius = info->radius; // [RH] Use real radius
if (!P_CheckPosition (thing, thing->Pos()))
if (!nocheck && !P_CheckPosition (thing, thing->Pos()))
{
thing->flags = oldflags;
thing->radius = oldradius;