incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix incorrect gametype

Browse source
This commit is contained in:
NepDisk 2025-05-28 11:03:06 -04:00
parent 8faba2dd35
commit c96662e714
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/d_netcmd.c
View file

@ -2804,15 +2804,21 @@ void D_SetupVote(void)
for (i = 0; i < VOTEROWSADDSONE; i++) for (i = 0; i < VOTEROWSADDSONE; i++)
{ {
UINT16 m; UINT16 m;
UINT16 hellpick = 0;
hellpick = ((i == ((VOTEROWS) + 1) ) ? 2 : 0);
if (i == VOTEROWS)
hellpick = 1;
if (i == 2) // sometimes a different gametype if (i == 2) // sometimes a different gametype
m = G_RandMap(G_TOLFlag(secondgt), prevmap, ((secondgt != gametype) ? 2 : 0), 0, true, votebuffer); 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 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 else
m = G_RandMap(G_TOLFlag(gt), prevmap, 0, 0, true, votebuffer); m = G_RandMap(G_TOLFlag(gt), prevmap, 0, 0, true, votebuffer);
if (i < VOTEROWS) 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); WRITEUINT16(p, m);
} }