thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Count nullHitlag for inflictor player too

Browse source 
Cancel hitlag of inflictor player too if the inflictor is
a constant damage source and the target is invincible.
This commit is contained in:
James R 2023-03-11 05:14:37 -08:00
parent b2a6ffecf9
commit 622bfa9512
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_player.h
View file

@ -641,8 +641,10 @@ struct player_t
INT16 lastsidehit, lastlinehit; INT16 lastsidehit, lastlinehit;
// These track how many things tried to damage you, not // TimesHit tracks how many times something tried to
// whether you actually took damage. // damage you or how many times you tried to damage
// something else. It does not track whether damage was
// actually dealt.
UINT8 timeshit; // times hit this tic UINT8 timeshit; // times hit this tic
UINT8 timeshitprev; // times hit before UINT8 timeshitprev; // times hit before
// That's TIMES HIT, not TIME SHIT, you doofus! -- in memoriam // That's TIMES HIT, not TIME SHIT, you doofus! -- in memoriam

10
src/p_inter.c
View file

@ -2060,6 +2060,7 @@ static void AddNullHitlag(player_t *player, tic_t oldHitlag)
boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype) boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
{ {
player_t *player; player_t *player;
player_t *playerInflictor;
boolean force = false; boolean force = false;
INT32 laglength = 6; INT32 laglength = 6;
@ -2138,10 +2139,15 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
} }
player = target->player; player = target->player;
playerInflictor = inflictor ? inflictor->player : NULL;
if (playerInflictor)
{
AddTimesHit(playerInflictor);
}
if (player) // Player is the target if (player) // Player is the target
{ {
AddTimesHit(player); AddTimesHit(player);
if (player->pflags & PF_GODMODE) if (player->pflags & PF_GODMODE)
@ -2208,11 +2214,13 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (invincible && type != DMG_STUMBLE) if (invincible && type != DMG_STUMBLE)
{ {
const INT32 oldHitlag = target->hitlag; const INT32 oldHitlag = target->hitlag;
const INT32 oldHitlagInflictor = inflictor ? inflictor->hitlag : 0;
laglength = max(laglength / 2, 1); laglength = max(laglength / 2, 1);
K_SetHitLagForObjects(target, inflictor, laglength, false); K_SetHitLagForObjects(target, inflictor, laglength, false);
AddNullHitlag(player, oldHitlag); AddNullHitlag(player, oldHitlag);
AddNullHitlag(playerInflictor, oldHitlagInflictor);
if (player->timeshit > player->timeshitprev) if (player->timeshit > player->timeshitprev)
{ {