diff --git a/src/k_botsearch.c b/src/k_botsearch.c index 74a458bce..26fc9f73d 100644 --- a/src/k_botsearch.c +++ b/src/k_botsearch.c @@ -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?! // Squishing if (K_PlayerAttackSteer(thing, side, 20, - globalsmuggle.botmo->scale > thing->scale + (mapobjectscale/8), - thing->scale > globalsmuggle.botmo->scale + (mapobjectscale/8) + K_IsBigger(globalsmuggle.botmo, thing), + K_IsBigger(thing, globalsmuggle.botmo) )) { break; diff --git a/src/k_collide.c b/src/k_collide.c index e0b3b2253..a373af5c2 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -758,8 +758,10 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2) if (P_PlayerInPain(t2->player) || t2->player->flashing || t2->player->hyudorotimer - || t2->player->justbumped || t2->scale > t1->scale + (mapobjectscale/8)) + || t2->player->justbumped || K_IsBigger(t2, t1)) + { return true; + } // Player Damage 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; // 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->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->flamedash > 0 && t2->player->itemtype == KITEM_FLAMESHIELD);