From fd7eb42e9d6358a257ce2fbc2e75f4b7ba23c10b Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 13 Jan 2024 14:31:15 -0800 Subject: [PATCH] Vote: fix Encore appearing on Battle, if gametype was changed --- src/d_netcmd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b950aec95..165d8ca84 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2194,6 +2194,8 @@ void D_MapChange(UINT16 mapnum, INT32 newgametype, boolean pencoremode, boolean void D_SetupVote(INT16 newgametype) { + const UINT32 rules = gametypes[newgametype]->rules; + UINT8 buf[(VOTE_NUM_LEVELS * 2) + 4]; UINT8 *p = buf; @@ -2203,7 +2205,7 @@ void D_SetupVote(INT16 newgametype) memset(votebuffer, UINT16_MAX, sizeof(votebuffer)); WRITEINT16(p, newgametype); - WRITEUINT8(p, ((cv_kartencore.value == 1) && (gametyperules & GTR_ENCORE))); + WRITEUINT8(p, ((cv_kartencore.value == 1) && (rules & GTR_ENCORE))); WRITEUINT8(p, G_SometimesGetDifferentEncore()); for (i = 0; i < VOTE_NUM_LEVELS; i++)