thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't let players change their vote after the vote has ended

Browse source
This commit is contained in:
James R 2019-11-05 19:22:54 -08:00
parent 2c67c97c58
commit 8bbb228c58
1 changed files with 52 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
src/y_inter.c
View file

@ -1555,63 +1555,70 @@ void Y_VoteTicker(void)
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;
for (i = 0; i <= splitscreen; i++) /*
The vote ended, but it will take at least a tic for that to reach us from
the server. Don't let me change the vote now, it won't matter anyway!
*/
if (timer)
{ {
UINT8 p; for (i = 0; i <= splitscreen; i++)
boolean pressed = false;
switch (i)
{ {
case 1: UINT8 p;
p = displayplayers[1]; boolean pressed = false;
break;
case 2:
p = displayplayers[2];
break;
case 3:
p = displayplayers[3];
break;
default:
p = consoleplayer;
break;
}
if (voteclient.playerinfo[i].delay) switch (i)
voteclient.playerinfo[i].delay--;
if ((playeringame[p] && !players[p].spectator)
&& !voteclient.playerinfo[i].delay
&& pickedvote == -1 && votes[p] == -1)
{
if (InputDown(gc_aimforward, i+1) || JoyAxis(AXISAIM, i+1) < 0)
{ {
voteclient.playerinfo[i].selection--; case 1:
pressed = true; p = displayplayers[1];
break;
case 2:
p = displayplayers[2];
break;
case 3:
p = displayplayers[3];
break;
default:
p = consoleplayer;
break;
} }
if ((InputDown(gc_aimbackward, i+1) || JoyAxis(AXISAIM, i+1) > 0) && !pressed) if (voteclient.playerinfo[i].delay)
voteclient.playerinfo[i].delay--;
if ((playeringame[p] && !players[p].spectator)
&& !voteclient.playerinfo[i].delay
&& pickedvote == -1 && votes[p] == -1)
{ {
voteclient.playerinfo[i].selection++; if (InputDown(gc_aimforward, i+1) || JoyAxis(AXISAIM, i+1) < 0)
pressed = true; {
voteclient.playerinfo[i].selection--;
pressed = true;
}
if ((InputDown(gc_aimbackward, i+1) || JoyAxis(AXISAIM, i+1) > 0) && !pressed)
{
voteclient.playerinfo[i].selection++;
pressed = true;
}
if (voteclient.playerinfo[i].selection < 0)
voteclient.playerinfo[i].selection = 3;
if (voteclient.playerinfo[i].selection > 3)
voteclient.playerinfo[i].selection = 0;
if ((InputDown(gc_accelerate, i+1) || JoyAxis(AXISMOVE, i+1) > 0) && !pressed)
{
D_ModifyClientVote(voteclient.playerinfo[i].selection, i);
pressed = true;
}
} }
if (voteclient.playerinfo[i].selection < 0) if (pressed)
voteclient.playerinfo[i].selection = 3;
if (voteclient.playerinfo[i].selection > 3)
voteclient.playerinfo[i].selection = 0;
if ((InputDown(gc_accelerate, i+1) || JoyAxis(AXISMOVE, i+1) > 0) && !pressed)
{ {
D_ModifyClientVote(voteclient.playerinfo[i].selection, i); S_StartSound(NULL, sfx_kc4a);
pressed = true; voteclient.playerinfo[i].delay = NEWTICRATE/7;
} }
} }
if (pressed)
{
S_StartSound(NULL, sfx_kc4a);
voteclient.playerinfo[i].delay = NEWTICRATE/7;
}
} }
if (server) if (server)