thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Swap them

Browse source
This commit is contained in:
Sally Coolatta 2022-09-24 16:15:25 -04:00
parent eedff2dea9
commit 08b2c09fe1
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/k_collide.c
View file

@ -882,21 +882,6 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
return false; return false;
} }
// Cause stumble on scale difference
t1Condition = (t1->scale > t2->scale + (mapobjectscale/8));
t2Condition = (t2->scale > t1->scale + (mapobjectscale/8));
if (t1Condition == true && t2Condition == false)
{
K_StumblePlayer(t2->player);
return true;
}
else if (t1Condition == false && t2Condition == true)
{
K_StumblePlayer(t1->player);
return true;
}
// Cause tumble on invincibility // Cause tumble on invincibility
t1Condition = (t1->player->invincibilitytimer > 0); t1Condition = (t1->player->invincibilitytimer > 0);
t2Condition = (t2->player->invincibilitytimer > 0); t2Condition = (t2->player->invincibilitytimer > 0);
@ -912,6 +897,21 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
return true; return true;
} }
// Cause stumble on scale difference
t1Condition = (t1->scale > t2->scale + (mapobjectscale/8));
t2Condition = (t2->scale > t1->scale + (mapobjectscale/8));
if (t1Condition == true && t2Condition == false)
{
K_StumblePlayer(t2->player);
return true;
}
else if (t1Condition == false && t2Condition == true)
{
K_StumblePlayer(t1->player);
return true;
}
// Flame Shield dash damage // Flame Shield dash damage
t1Condition = (t1->player->flamedash > 0 && t1->player->itemtype == KITEM_FLAMESHIELD); t1Condition = (t1->player->flamedash > 0 && t1->player->itemtype == KITEM_FLAMESHIELD);
t2Condition = (t2->player->flamedash > 0 && t2->player->itemtype == KITEM_FLAMESHIELD); t2Condition = (t2->player->flamedash > 0 && t2->player->itemtype == KITEM_FLAMESHIELD);