thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-21 15:32:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

1x flame/lightning shield

Browse source
This commit is contained in:
AJ Martinez 2024-03-20 22:45:29 -07:00 • committed by James R
parent 1a61239d7f
commit 0e88da0f6e
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_mobj.c
View file

@ -7729,11 +7729,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
newScale = FixedMul(newScale, FixedDiv(newHeight / 2, mobj->target->height)); newScale = FixedMul(newScale, FixedDiv(newHeight / 2, mobj->target->height));
} }
if (mobj->target->player->curshield == KSHIELD_FLAME)
{
newScale = 8 * newScale / 5;
}
mobj->angle = K_MomentumAngle(mobj->target); mobj->angle = K_MomentumAngle(mobj->target);
P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + (newHeight / 2)); P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + (newHeight / 2));
mobj->destscale = newScale; mobj->destscale = newScale;
@ -8386,7 +8381,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
P_RemoveMobj(mobj); P_RemoveMobj(mobj);
return false; return false;
} }
P_SetScale(mobj, (mobj->destscale = (7*mobj->target->scale)>>2)); P_SetScale(mobj, (mobj->destscale = (5*mobj->target->scale)>>2));
P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + mobj->target->height/2); P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + mobj->target->height/2);
break; break;
@ -8515,7 +8510,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
flamemax = mobj->target->player->flamelength; flamemax = mobj->target->player->flamelength;
P_SetScale(mobj, (mobj->destscale = (8*mobj->target->scale)>>2)); P_SetScale(mobj, (mobj->destscale = (5*mobj->target->scale)>>2));
curstate = ((mobj->tics == 1) ? (mobj->state->nextstate) : ((statenum_t)(mobj->state-states))); curstate = ((mobj->tics == 1) ? (mobj->state->nextstate) : ((statenum_t)(mobj->state-states)));