Merge branch 'next' into public_next

This commit is contained in:
spherallic 2023-04-18 02:05:19 +02:00
commit 3135cd37e6
2 changed files with 4 additions and 1 deletions

View file

@ -2825,6 +2825,9 @@ void G_MovePlayerToSpawnOrStarpost(INT32 playernum)
R_ResetMobjInterpolationState(players[playernum].mo);
if (players[playernum].bot) // don't reset the camera for bots
return;
if (playernum == consoleplayer)
P_ResetCamera(&players[playernum], &camera);
else if (playernum == secondarydisplayplayer)

View file

@ -1412,7 +1412,7 @@ void ST_drawTitleCard(void)
lt_lasttic = lt_ticker;
luahook:
if (renderisnewtic)
//if (renderisnewtic)
{
LUA_HUD_ClearDrawList(luahuddrawlist_titlecard);
LUA_HUDHOOK(titlecard, luahuddrawlist_titlecard);