thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-whip-clash' into 'master'

Browse source 
Let Insta-Whip clashing ignore flashing tics

Closes #978

See merge request KartKrew/Kart!1870
This commit is contained in:
Oni 2024-02-03 19:43:11 +00:00
commit 39b5a8ac2f
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/k_collide.cpp
View file

@ -848,27 +848,33 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
{ {
player_t *victimPlayer = victim->player; player_t *victimPlayer = victim->player;
if (victim != attacker && (P_PlayerInPain(victimPlayer) ? victim->hitlag == 0 : victimPlayer->flashing == 0)) if (victim == attacker)
return false;
// If both players have a whip, hits are order-of-execution dependent and that sucks.
// Player expectation is a clash here.
if (victimPlayer->whip && !P_MobjWasRemoved(victimPlayer->whip))
{ {
// If both players have a whip, hits are order-of-execution dependent and that sucks. if (victim->hitlag != 0)
// Player expectation is a clash here.
if (victimPlayer->whip && !P_MobjWasRemoved(victimPlayer->whip))
{
victimPlayer->whip->extravalue2 = 1;
shield->extravalue2 = 1;
K_DoPowerClash(victim, attacker);
victim->renderflags &= ~RF_DONTDRAW;
attacker->renderflags &= ~RF_DONTDRAW;
angle_t thrangle = R_PointToAngle2(attacker->x, attacker->y, victim->x, victim->y);
P_Thrust(victim, thrangle, mapobjectscale*28);
P_Thrust(attacker, ANGLE_180 + thrangle, mapobjectscale*28);
return false; return false;
}
victimPlayer->whip->extravalue2 = 1;
shield->extravalue2 = 1;
K_DoPowerClash(victim, attacker);
victim->renderflags &= ~RF_DONTDRAW;
attacker->renderflags &= ~RF_DONTDRAW;
angle_t thrangle = R_PointToAngle2(attacker->x, attacker->y, victim->x, victim->y);
P_Thrust(victim, thrangle, mapobjectscale*28);
P_Thrust(attacker, ANGLE_180 + thrangle, mapobjectscale*28);
return false;
}
if (P_PlayerInPain(victimPlayer) ? victim->hitlag == 0 : victimPlayer->flashing == 0)
{
// Instawhip _always_ loses to guard. // Instawhip _always_ loses to guard.
if (K_PlayerGuard(victimPlayer)) if (K_PlayerGuard(victimPlayer))
//if (true) //if (true)