thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-03 06:33:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use K_IsBigger for more remaining old scale checks

Browse source
This commit is contained in:
Sally Coolatta 2022-09-24 20:00:28 -04:00
parent a9634dde2f
commit 4a743369e4
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_botsearch.c
View file

@ -501,8 +501,8 @@ static BlockItReturn_t K_FindObjectsForNudging(mobj_t *thing)
// There REALLY ought to be a better way to handle this logic, right?! // There REALLY ought to be a better way to handle this logic, right?!
// Squishing // Squishing
if (K_PlayerAttackSteer(thing, side, 20, if (K_PlayerAttackSteer(thing, side, 20,
globalsmuggle.botmo->scale > thing->scale + (mapobjectscale/8), K_IsBigger(globalsmuggle.botmo, thing),
thing->scale > globalsmuggle.botmo->scale + (mapobjectscale/8) K_IsBigger(thing, globalsmuggle.botmo)
)) ))
{ {
break; break;

8
src/k_collide.c
View file

@ -758,8 +758,10 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
if (P_PlayerInPain(t2->player) if (P_PlayerInPain(t2->player)
|| t2->player->flashing || t2->player->hyudorotimer || t2->player->flashing || t2->player->hyudorotimer
|| t2->player->justbumped || t2->scale > t1->scale + (mapobjectscale/8)) || t2->player->justbumped || K_IsBigger(t2, t1))
{
return true; return true;
}
// Player Damage // Player Damage
P_DamageMobj(t2, ((t1->type == MT_BUBBLESHIELD) ? t1->target : t1), t1, 1, DMG_NORMAL|DMG_WOMBO); P_DamageMobj(t2, ((t1->type == MT_BUBBLESHIELD) ? t1->target : t1), t1, 1, DMG_NORMAL|DMG_WOMBO);
@ -868,11 +870,11 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
boolean stungT2 = false; boolean stungT2 = false;
// Clash instead of damage if both parties have any of these conditions // Clash instead of damage if both parties have any of these conditions
t1Condition = (t1->scale > t2->scale + (mapobjectscale/8)) t1Condition = (K_IsBigger(t1, t2) == true)
|| (t1->player->invincibilitytimer > 0) || (t1->player->invincibilitytimer > 0)
|| (t1->player->flamedash > 0 && t1->player->itemtype == KITEM_FLAMESHIELD); || (t1->player->flamedash > 0 && t1->player->itemtype == KITEM_FLAMESHIELD);
t2Condition = (t2->scale > t1->scale + (mapobjectscale/8)) t2Condition = (K_IsBigger(t2, t1) == true)
|| (t2->player->invincibilitytimer > 0) || (t2->player->invincibilitytimer > 0)
|| (t2->player->flamedash > 0 && t2->player->itemtype == KITEM_FLAMESHIELD); || (t2->player->flamedash > 0 && t2->player->itemtype == KITEM_FLAMESHIELD);