OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added: Boolean to specify if A_Raise functions should perform CopyFriendliness based upon who raised it. By default, this is false.

Browse source
This commit is contained in:
MajorCooke 2014-11-27 15:12:33 -06:00
commit 94f08aa593
5 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/p_things.cpp
View file

@ -412,7 +412,7 @@ void P_RemoveThing(AActor * actor)
}
bool P_Thing_Raise(AActor *thing)
bool P_Thing_Raise(AActor *thing, AActor *raiser)
{
FState * RaiseState = thing->GetRaiseState();
if (RaiseState == NULL)
@ -445,6 +445,12 @@ bool P_Thing_Raise(AActor *thing)
thing->Revive();
if (raiser != NULL)
{
// Let's copy the friendliness of the one who raised it.
thing->CopyFriendliness(raiser, false);
}
thing->SetState (RaiseState);
return true;
}