Merge branch 'dedicatedemeraldbounce' into 'next'

Skip emerald bounce logic in intermission ticker on dedicated

See merge request STJr/SRB2!1969
This commit is contained in:
sphere 2023-05-01 21:17:46 +00:00
commit eabfadfdf7

View file

@ -1133,7 +1133,12 @@ void Y_Ticker(void)
}
// emerald bounce
if (intertic <= 1)
if (dedicated || !LUA_HudEnabled(hud_intermissionemeralds))
{
// dedicated servers don't need this, especially since it crashes when stagefailed
// also skip this if Lua disabled intermission emeralds, so it doesn't play sounds
}
else if (intertic <= 1)
{
data.spec.emeraldbounces = 0;
data.spec.emeraldmomy = 20;