Don't attempt itemamount correction after orbitals self-destruct
This commit is contained in:
1 parent
9bdda66a0c
commit
0cff3c23f3
1 file changed
+3
-3
+3
-3
@@ -4686,7 +4686,6 @@ void K_RepairOrbitChain(mobj_t *orbit)
|
||||
// Then recount to make sure item amount is correct
|
||||
if (orbit->target && orbit->target->player)
|
||||
{
|
||||
player_t *player = orbit->target->player;
|
||||
INT32 num = 0;
|
||||
|
||||
mobj_t *cur = orbit->target->hnext;
|
||||
@@ -4696,13 +4695,14 @@ void K_RepairOrbitChain(mobj_t *orbit)
|
||||
{
|
||||
prev = cur;
|
||||
cur = cur->hnext;
|
||||
if (++num > player->kartstuff[k_itemamount])
|
||||
if (++num > orbit->target->player->kartstuff[k_itemamount])
|
||||
P_RemoveMobj(prev);
|
||||
else
|
||||
prev->movedir = num;
|
||||
}
|
||||
|
||||
player->kartstuff[k_itemamount] = num;
|
||||
if (orbit->target) // !P_MobjWasRemoved(orbit->target)
|
||||
orbit->target->player->kartstuff[k_itemamount] = num;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user