mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'fix-botscanvote' into 'master'
Fix map voting/striking for bots Closes ring-racers#333 See merge request kart-krew-dev/ring-racers-internal!2949
This commit is contained in:
commit
09c6ee99f2
1 changed files with 3 additions and 4 deletions
|
|
@ -1845,7 +1845,7 @@ static void Y_TickVoteStageStrike(void)
|
||||||
static void Y_TickVoteSelection(void)
|
static void Y_TickVoteSelection(void)
|
||||||
{
|
{
|
||||||
boolean everyone_voted = true;/* the default condition */
|
boolean everyone_voted = true;/* the default condition */
|
||||||
INT32 i;
|
INT32 i, j;
|
||||||
|
|
||||||
if (vote.tic < 3*(NEWTICRATE/7)) // give it some time before letting you control it :V
|
if (vote.tic < 3*(NEWTICRATE/7)) // give it some time before letting you control it :V
|
||||||
{
|
{
|
||||||
|
|
@ -1872,7 +1872,6 @@ static void Y_TickVoteSelection(void)
|
||||||
if (vote.players[i].sentTimeOutVote == false)
|
if (vote.players[i].sentTimeOutVote == false)
|
||||||
{
|
{
|
||||||
// Move off of striked stages for the timeout vote.
|
// Move off of striked stages for the timeout vote.
|
||||||
INT32 j;
|
|
||||||
for (j = 0; j < VOTE_NUM_LEVELS; j++)
|
for (j = 0; j < VOTE_NUM_LEVELS; j++)
|
||||||
{
|
{
|
||||||
if (g_votes_striked[vote.players[i].selection] == false)
|
if (g_votes_striked[vote.players[i].selection] == false)
|
||||||
|
|
@ -1944,9 +1943,9 @@ static void Y_TickVoteSelection(void)
|
||||||
{
|
{
|
||||||
// bots vote randomly
|
// bots vote randomly
|
||||||
INT32 rng = M_RandomKey(VOTE_NUM_LEVELS);
|
INT32 rng = M_RandomKey(VOTE_NUM_LEVELS);
|
||||||
for (i = 0; i < VOTE_NUM_LEVELS; i++)
|
for (j = 0; j < VOTE_NUM_LEVELS; j++)
|
||||||
{
|
{
|
||||||
if (g_votes_striked[i] == false)
|
if (g_votes_striked[j] == false)
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue