vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'actions-tweaks' into 'next' 

Actions tweaks

This just rewrites the action A_SetTargetsTarget currently, dunno if I'll bother to tweak any more actions in the near future \*shrugs\*

That said, PLEASE check whether the action works properly before accepting the merge. It's been a while since I last did anything with this branch, so I forget entirely whether I tested it or not.

See merge request !27
This commit is contained in:
Nipples the Enchilada 2015-12-30 14:45:37 -05:00
parent 93c31b5b72 b449bd826a
commit 0a0f16a001
1 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/p_enemy.c
View File

@ -7597,48 +7597,35 @@ void A_SetTargetsTarget(mobj_t *actor)
{ {
INT32 locvar1 = var1; INT32 locvar1 = var1;
INT32 locvar2 = var2; INT32 locvar2 = var2;
mobj_t *targetedmobj = NULL; mobj_t *oldtarg = NULL, *newtarg = NULL;
thinker_t *th;
mobj_t *mo2;
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
if (LUA_CallAction("A_SetTargetsTarget", actor)) if (LUA_CallAction("A_SetTargetsTarget", actor))
return; return;
#endif #endif
if ((!locvar1 && (!actor->target)) || (locvar1 && (!actor->tracer))) // actor's target
if (locvar1) // or tracer
oldtarg = actor->tracer;
else
oldtarg = actor->target;
if (P_MobjWasRemoved(oldtarg))
return; return;
if ((!locvar1 && !locvar2 && (!actor->target->target)) // actor's target's target!
|| (!locvar1 && locvar2 && (!actor->target->tracer)) if (locvar2) // or tracer
|| (locvar1 && !locvar2 && (!actor->tracer->target)) newtarg = oldtarg->tracer;
|| (locvar1 && locvar2 && (!actor->tracer->tracer)))
return; // Don't search for nothing.
// scan the thinkers
for (th = thinkercap.next; th != &thinkercap; th = th->next)
{
if (th->function.acp1 != (actionf_p1)P_MobjThinker)
continue;
mo2 = (mobj_t *)th;
if ((!locvar1 && !locvar2 && (mo2 == actor->target->target))
|| (!locvar1 && locvar2 && (mo2 == actor->target->tracer))
|| (locvar1 && !locvar2 && (mo2 == actor->tracer->target))
|| (locvar1 && locvar2 && (mo2 == actor->tracer->tracer)))
{
targetedmobj = mo2;
break;
}
}
if (!targetedmobj)
return; // Oops, nothing found..
if (!locvar1)
P_SetTarget(&actor->target, targetedmobj);
else else
P_SetTarget(&actor->tracer, targetedmobj); newtarg = oldtarg->target;
if (P_MobjWasRemoved(newtarg))
return;
// set actor's new target
if (locvar1) // or tracer
P_SetTarget(&actor->tracer, newtarg);
else
P_SetTarget(&actor->target, newtarg);
} }
// Function: A_SetObjectFlags // Function: A_SetObjectFlags