From 919667ed39c8d51995e0e8225e7c8021a12b9df3 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 3 Dec 2018 00:33:35 -0500 Subject: [PATCH] Just do MapChange hook on G_InitNew Everything that's supposed to call it also calls this... --- src/d_netcmd.c | 8 ++++---- src/g_game.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 3429034d..f2979838 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2310,9 +2310,9 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum) INT32 resetplayer = 1, lastgametype; UINT8 skipprecutscene, FLS; boolean pencoremode; -#ifdef HAVE_BLUA +/*#ifdef HAVE_BLUA INT16 mapnumber; -#endif +#endif*/ forceresetplayers = deferencoremode = false; @@ -2379,10 +2379,10 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum) if (modeattacking) // i remember moving this here in internal fixed a heisenbug so SetPlayerSkinByNum(0, cv_chooseskin.value-1); -#ifdef HAVE_BLUA +/*#ifdef HAVE_BLUA mapnumber = M_MapNumber(mapname[3], mapname[4]); LUAh_MapChange(mapnumber); -#endif +#endif*/ G_InitNew(pencoremode, mapname, resetplayer, skipprecutscene); if (demoplayback && !timingdemo) diff --git a/src/g_game.c b/src/g_game.c index ed915381..64b76363 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -5917,9 +5917,9 @@ void G_DoPlayDemo(char *defdemoname) // didn't start recording right away. demo_start = false; -#ifdef HAVE_BLUA +/*#ifdef HAVE_BLUA LUAh_MapChange(gamemap); -#endif +#endif*/ displayplayer = consoleplayer = 0; memset(playeringame,0,sizeof(playeringame)); playeringame[0] = true;