Merge branch 'fix-sphere-box' into 'master'

Fix Sphere Boxes not awarding spheres

See merge request KartKrew/Kart!1319
This commit is contained in:
Gunla 2023-07-01 02:22:43 +00:00
commit a8a8d375c3
2 changed files with 2 additions and 2 deletions

View file

@ -256,7 +256,7 @@ mobj_t *K_SpawnSphereBox(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT8 f
drop->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
drop->extravalue1 = amount;
drop->extravalue2 = amount;
return drop;
}

View file

@ -383,7 +383,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
P_SetTarget(&special->target, toucher);
// P_KillMobj(special, toucher, toucher, DMG_NORMAL);
P_ItemPop(special);
P_GivePlayerSpheres(player, special->extravalue1);
P_GivePlayerSpheres(player, special->extravalue2);
return;
case MT_ITEMCAPSULE:
if (special->scale < special->extravalue1) // don't break it while it's respawning