mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Fix unlobbable eggbox
This commit is contained in:
parent
ef853bafc4
commit
a1c99fa890
1 changed files with 3 additions and 3 deletions
|
|
@ -167,9 +167,6 @@ boolean K_EggItemCollide(mobj_t *t1, mobj_t *t2)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (K_TryPickMeUp(t1, t2))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
if (t2->player)
|
if (t2->player)
|
||||||
{
|
{
|
||||||
if ((t1->target == t2 || t1->target == t2->target) && (t1->threshold > 0))
|
if ((t1->target == t2 || t1->target == t2->target) && (t1->threshold > 0))
|
||||||
|
|
@ -178,6 +175,9 @@ boolean K_EggItemCollide(mobj_t *t1, mobj_t *t2)
|
||||||
if (t1->health <= 0 || t2->health <= 0)
|
if (t1->health <= 0 || t2->health <= 0)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
if (K_TryPickMeUp(t1, t2))
|
||||||
|
return true;
|
||||||
|
|
||||||
if (!P_CanPickupItem(t2->player, 2))
|
if (!P_CanPickupItem(t2->player, 2))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue