mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-02-27 16:01:17 +00:00
Merge branch 'thunderdome-shit-yourself' into 'master'
Fix thunderdome cvar potentially being taken into !K_CanChangeRules contexts See merge request kart-krew-dev/ring-racers-internal!2844
This commit is contained in:
commit
93735969a0
1 changed files with 1 additions and 3 deletions
|
|
@ -489,9 +489,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||
if (special->fuse) // This box is respawning, but was broken very recently (see P_FuseThink)
|
||||
{
|
||||
// What was this box broken as?
|
||||
if (cv_thunderdome.value)
|
||||
K_StartItemRoulette(player, true);
|
||||
else if (special->cvmem && !(special->flags2 & MF2_BOSSDEAD))
|
||||
if (!K_ThunderDome() && special->cvmem && !(special->flags2 & MF2_BOSSDEAD))
|
||||
K_StartItemRoulette(player, false);
|
||||
else
|
||||
K_StartItemRoulette(player, true);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue