From 31728166cab6a1b202511bad7deb296ef97d307b Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 10 Apr 2023 02:27:48 -0400 Subject: [PATCH] Adjust map anger conditions Don't reset map anger when it votes for itself -- wait until the map gets played or it gets a genuine vote from someone. --- src/g_game.c | 1 + src/k_vote.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index e9168df51..5988ce3bb 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3892,6 +3892,7 @@ void G_AddMapToBuffer(INT16 map) // Set our map's justPlayed value. mapheaderinfo[map]->justPlayed = TOLMaps(gametype) - VOTE_NUM_LEVELS; + mapheaderinfo[map]->anger = 0; // Reset voting anger now that we're playing it } // diff --git a/src/k_vote.c b/src/k_vote.c index 5e8f78b2d..0f9c17520 100644 --- a/src/k_vote.c +++ b/src/k_vote.c @@ -1250,9 +1250,6 @@ static void Y_TryMapAngerVote(void) // Set the special vote to a random angry map. pick = M_RandomKey(angryMapsCount); D_ModifyClientVote(UINT8_MAX, angryMaps[pick]); - - // Make it not angry anymore. - mapheaderinfo[ g_voteLevels[ angryMaps[pick] ][0] ]->anger = 0; } static void Y_TickVoteSelection(void)