thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't pick the vote twice

Browse source
This commit is contained in:
James R 2019-11-05 19:42:29 -08:00
parent 8bbb228c58
commit 8844e51afc
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/y_inter.c
View file

@ -155,6 +155,7 @@ static y_votelvlinfo levelinfo[5];
static y_voteclient voteclient; static y_voteclient voteclient;
static INT32 votetic; static INT32 votetic;
static INT32 voteendtic = -1; static INT32 voteendtic = -1;
static boolean votenotyetpicked;
static patch_t *cursor = NULL; static patch_t *cursor = NULL;
static patch_t *cursor1 = NULL; static patch_t *cursor1 = NULL;
static patch_t *cursor2 = NULL; static patch_t *cursor2 = NULL;
@ -1550,7 +1551,7 @@ void Y_VoteTicker(void)
else else
voteclient.ranim = pickedvote; voteclient.ranim = pickedvote;
} }
else else if (votenotyetpicked)
{ {
if (votetic < 3*(NEWTICRATE/7)) // give it some time before letting you control it :V if (votetic < 3*(NEWTICRATE/7)) // give it some time before letting you control it :V
return; return;
@ -1642,9 +1643,12 @@ void Y_VoteTicker(void)
timer = 0; timer = 0;
if (voteendtic == -1) if (voteendtic == -1)
{
votenotyetpicked = false;/* don't pick vote twice */
D_PickVote(); D_PickVote();
} }
} }
}
} }
// //
@ -1676,6 +1680,8 @@ void Y_StartVote(void)
timer = cv_votetime.value*TICRATE; timer = cv_votetime.value*TICRATE;
pickedvote = -1; pickedvote = -1;
votenotyetpicked = true;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
voteclient.playerinfo[i].selection = 0; voteclient.playerinfo[i].selection = 0;