Updated for scripting branch merge.

This commit is contained in:
MajorCooke 2016-02-04 22:41:02 -06:00
commit 35b7a5ccc1
11 changed files with 61 additions and 10 deletions

View file

@ -1511,7 +1511,7 @@ dopain:
{
if (source == target->target)
{
target->threshold = BASETHRESHOLD;
target->threshold = target->DefThreshold;
if (target->state == target->SpawnState && target->SeeState != NULL)
{
target->SetState (target->SeeState);
@ -1532,7 +1532,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);