thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'tutorial-capsules' into 'master'

Browse source 
Allow all capsule spawns in Tutorial (resolves #725)

Closes #725

See merge request KartKrew/Kart!1633
This commit is contained in:
toaster 2023-11-16 10:04:13 +00:00
commit 323975f329
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/k_kart.c
View file

@ -150,33 +150,37 @@ static void K_SpawnItemCapsules(void)
continue;
}
modeFlags = mt->thing_args[3];
if (modeFlags == TMICM_DEFAULT)
if (gametype != GT_TUTORIAL) // Don't prevent capsule spawn via modeflags in Tutorial
{
if (isRingCapsule == true)
modeFlags = mt->thing_args[3];
if (modeFlags == TMICM_DEFAULT)
{
modeFlags = TMICM_MULTIPLAYER|TMICM_TIMEATTACK;
if (isRingCapsule == true)
{
modeFlags = TMICM_MULTIPLAYER|TMICM_TIMEATTACK;
}
else
{
modeFlags = TMICM_MULTIPLAYER;
}
}
if (K_CapsuleTimeAttackRules() == true)
{
if ((modeFlags & TMICM_TIMEATTACK) == 0)
{
continue;
}
}
else
{
modeFlags = TMICM_MULTIPLAYER;
if ((modeFlags & TMICM_MULTIPLAYER) == 0)
{
continue;
}
}
}
if (K_CapsuleTimeAttackRules() == true)
{
if ((modeFlags & TMICM_TIMEATTACK) == 0)
{
continue;
}
}
else
{
if ((modeFlags & TMICM_MULTIPLAYER) == 0)
{
continue;
}
}
P_SpawnMapThing(mt);
}