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

I'm an idiot and keep forgetting to hit trim trailing space.

This commit is contained in:
Latapostrophe 2018-10-25 00:59:43 +02:00
parent a24507b2eb
commit 474bebaad3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_enemy.c
View File

@ -8542,7 +8542,7 @@ void A_MayonakaArrow(mobj_t *actor)
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
if (LUA_CallAction("A_MayonakaArrow", (actor))) if (LUA_CallAction("A_MayonakaArrow", (actor)))
return; return;
#endif #endif
iswarning = actor->spawnpoint->options & MTF_OBJECTSPECIAL; // is our object a warning sign? iswarning = actor->spawnpoint->options & MTF_OBJECTSPECIAL; // is our object a warning sign?
// "animtimer" is replaced by "extravalue1" here. // "animtimer" is replaced by "extravalue1" here.
@ -8553,14 +8553,14 @@ void A_MayonakaArrow(mobj_t *actor)
flip = 6; flip = 6;
actor->frame = flip + actor->extravalue2*3; actor->frame = flip + actor->extravalue2*3;
if (actor->extravalue1 >= TICRATE*7/2) if (actor->extravalue1 >= TICRATE*7/2)
{ {
actor->extravalue1 = 0; // reset to 0 and start a new cycle. actor->extravalue1 = 0; // reset to 0 and start a new cycle.
// special behavior for warning sign; swap from warning to sneaker & reverse // special behavior for warning sign; swap from warning to sneaker & reverse
if (iswarning) if (iswarning)
actor->extravalue2 = (actor->extravalue2) ? (0) : (1); actor->extravalue2 = (actor->extravalue2) ? (0) : (1);
} }
else if (actor->extravalue1 > TICRATE*7/2 -4) else if (actor->extravalue1 > TICRATE*7/2 -4)
actor->frame = flip+2; actor->frame = flip+2;
else if (actor->extravalue1 > TICRATE*3 && leveltime%2 > 0) else if (actor->extravalue1 > TICRATE*3 && leveltime%2 > 0)