From c96662e714267d2b763f3cf4134447ffb5943b01 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Wed, 28 May 2025 11:03:06 -0400 Subject: [PATCH] Fix incorrect gametype --- src/d_netcmd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index a9860d3f0..fee441638 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2804,15 +2804,21 @@ void D_SetupVote(void) for (i = 0; i < VOTEROWSADDSONE; i++) { UINT16 m; + UINT16 hellpick = 0; + + hellpick = ((i == ((VOTEROWS) + 1) ) ? 2 : 0); + + if (i == VOTEROWS) + hellpick = 1; if (i == 2) // sometimes a different gametype m = G_RandMap(G_TOLFlag(secondgt), prevmap, ((secondgt != gametype) ? 2 : 0), 0, true, votebuffer); else if (i >= VOTEROWS) // unknown-random and formerly force-unknown MAP HELL - m = G_RandMap(G_TOLFlag(gt), prevmap, 0, (i-2), (i < 4), votebuffer); + m = G_RandMap(G_TOLFlag(gt), prevmap, 0, hellpick, (i < VOTEROWSADDSONE), votebuffer); else m = G_RandMap(G_TOLFlag(gt), prevmap, 0, 0, true, votebuffer); if (i < VOTEROWS) - votebuffer[i] = m; + votebuffer[min(i, 2)] = m; // min() is a dumb workaround for gcc 4.4 array-bounds error WRITEUINT16(p, m); }