Merge branch 'donttrycameramove' into 'next'

Fix trycameramove crash on dedicated server

See merge request STJr/SRB2!2491
This commit is contained in:
sphere 2024-07-01 11:56:43 +00:00
commit 42b298d427

View file

@ -2502,6 +2502,9 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
floatok = false;
if (dedicated) // this crashes so don't even try it
return false;
if (twodlevel
|| (thiscam == &camera && players[displayplayer].mo && (players[displayplayer].mo->flags2 & MF2_TWOD))
|| (thiscam == &camera2 && players[secondarydisplayplayer].mo && (players[secondarydisplayplayer].mo->flags2 & MF2_TWOD)))