OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fixed merge conflicts.

Browse source
This commit is contained in:
MajorCooke 2016-02-02 18:26:20 -06:00
commit a1c1de9edb
11 changed files with 59 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_interaction.cpp
View file

@ -1516,7 +1516,7 @@ dopain:
{
if (source == target->target)
{
target->threshold = BASETHRESHOLD;
target->threshold = target->DefThreshold; //BASETHRESHOLD is no longer used here.
if (target->state == target->SpawnState && target->SeeState != NULL)
{
target->SetState (target->SeeState);
@ -1537,7 +1537,7 @@ dopain:
target->lastenemy = target->target; // remember last enemy - killough
}
target->target = source;
target->threshold = BASETHRESHOLD;
target->threshold = target->DefThreshold;
if (target->state == target->SpawnState && target->SeeState != NULL)
{
target->SetState (target->SeeState);