vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

/me tears away a piece of drywall 

What's revealed is that democracy is actually made *entirely* out of
extremely minor 1 character long typos eating away at the structural
integrity of the building, and then the crack starts oozing green slime,
and then a creepy hand comes out and grabs you
This commit is contained in:
TehRealSalt 2018-02-08 00:45:59 -05:00
parent 2c09dd1df1
commit 32ee651f43
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/g_game.c
View File

@ -250,7 +250,7 @@ boolean legitimateexit; // Did this client actually finish the match? Calculated
tic_t curlap; // Current lap time, calculated locally
tic_t bestlap; // Best lap time, locally
INT16 randmapbuffer[3*NUMMAPS/4]; // Buffer for maps RandMap is allowed to roll
INT16 randmapbuffer[NUMMAPS-4]; // Buffer for maps RandMap is allowed to roll
// Voting system
INT16 votelevels[4]; // Levels that were rolled by the host
@ -3138,9 +3138,9 @@ INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean ignorebuffer)
if (!ignorebuffer)
{
for (bufx = 0; bufx < 3*NUMMAPS/4; bufx++)
for (bufx = 0; bufx < NUMMAPS-4; bufx++)
{
if (randmapbuffer[bufx] == 0) // Rest of buffer SHOULD be empty
if (randmapbuffer[bufx] == -1) // Rest of buffer SHOULD be empty
break;
if (ix == randmapbuffer[bufx])
{
@ -3160,15 +3160,15 @@ INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean ignorebuffer)
return G_RandMap(tolflags, pprevmap, true); // If there's no matches, (An incredibly silly function chain, buuut... :V)
ix = 0; // Sorry, none match. You get MAP01.
for (bufx = 0; bufx < 3*NUMMAPS/4; bufx++)
for (bufx = 0; bufx < NUMMAPS-4; bufx++)
randmapbuffer[bufx] = -1; // if we're having trouble finding a map we should probably clear it
}
else
{
ix = okmaps[P_RandomKey(numokmaps)];
for (bufx = 3*NUMMAPS/4; bufx > 0; bufx--)
/*for (bufx = NUMMAPS-4; bufx > 0; bufx--)
randmapbuffer[bufx] = randmapbuffer[bufx-1];
randmapbuffer[0] = ix;
randmapbuffer[0] = ix;*/
}
Z_Free(okmaps);
@ -3296,9 +3296,9 @@ static void G_DoCompleted(void)
automapactive = false;
if (randmapbuffer[(3*TOLMaps(G_TOLFlag(gametype))/4)]) // filled up, so lets clear it
if (randmapbuffer[TOLMaps(G_TOLFlag(gametype))-4)] != -1) // filled up, so lets clear it
{
for (i = 0; i < 3*NUMMAPS/4; i++)
for (i = 0; i < NUMMAPS-4; i++)
randmapbuffer[i] = -1;
}

18
src/y_inter.c
View File

@ -2232,18 +2232,8 @@ void Y_VoteDrawer(void)
//V_DrawScaledPatch(x, y, V_SNAPTOBOTTOM, pic);
if (timer)
{
if (votes[consoleplayer] == -1)
{
V_DrawCenteredString(BASEVIDWIDTH/2, 188, V_YELLOWMAP|V_SNAPTOBOTTOM,
va("Vote ends in %d seconds", timer/TICRATE));
}
else
{
V_DrawCenteredString(BASEVIDWIDTH/2, 188, V_YELLOWMAP|V_SNAPTOBOTTOM,
va("Waiting for everyone to vote..."));
}
}
V_DrawCenteredString(BASEVIDWIDTH/2, 188, V_YELLOWMAP|V_SNAPTOBOTTOM,
va("Vote ends in %d seconds", timer/TICRATE));
}
//
@ -2272,7 +2262,7 @@ void Y_VoteTicker(void)
{
if (!playeringame[i] || players[i].spectator)
votes[i] = -1;
else if (pickedvote != -1 && votes[i] == -1)
else if (pickedvote != -1 && votes[i] == -1 && !splitscreen)
votes[i] = 3; // Slow people get random
}
@ -2312,7 +2302,7 @@ void Y_VoteTicker(void)
}
randomanim = tempvotes[((pickedvote + ((voteendtic-votetic) / (TICRATE/7))) % numvotes)];
S_StartSound(NULL, sfx_menu1);
S_StartSound(NULL, sfx_s3k5b);
}
else
{