Revert readyplayers hinttext display changes.

splewis · Nov 4, 2021 · 3cf46d6 · 3cf46d6 · fiatjaf · Nov 9, 2021
1 parent 90df0ae
commit 3cf46d6
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/scripting/pugsetup.sp b/scripting/pugsetup.sp
@@ -595,9 +595,7 @@ public Action Timer_CheckReady(Handle timer) {
     }
   }
 
-  int neededPlayers = PugSetup_GetPugMaxPlayers();
-
-  if (totalPlayers >= neededPlayers) {
+  if (totalPlayers >= PugSetup_GetPugMaxPlayers()) {
     GiveReadyHints();
   }
 
@@ -610,7 +608,7 @@ public Action Timer_CheckReady(Handle timer) {
       if (g_TeamType == TeamType_Captains) {
         if (IsPlayer(g_capt1) && IsPlayer(g_capt2) && g_capt1 != g_capt2) {
           g_LiveTimerRunning = false;
-          PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, neededPlayers,
+          PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, totalPlayers,
                              "ReadyStatusAllReadyPick");
           CreateTimer(1.0, StartPicking, _, TIMER_FLAG_NO_MAPCHANGE);
           return Plugin_Stop;
@@ -621,10 +619,10 @@ public Action Timer_CheckReady(Handle timer) {
         g_LiveTimerRunning = false;
 
         if (g_AutoLive) {
-          PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, neededPlayers,
+          PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, totalPlayers,
                              "ReadyStatusAllReady");
         } else {
-          PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, neededPlayers,
+          PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, totalPlayers,
                              "ReadyStatusAllReadyWaiting");
         }
 
@@ -636,7 +634,7 @@ public Action Timer_CheckReady(Handle timer) {
       if (g_MapType == MapType_Veto) {
         if (IsPlayer(g_capt1) && IsPlayer(g_capt2) && g_capt1 != g_capt2) {
           g_LiveTimerRunning = false;
-          PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, neededPlayers,
+          PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, totalPlayers,
                              "ReadyStatusAllReadyVeto");
           PugSetup_MessageToAll("%t", "VetoMessage");
           CreateTimer(2.0, MapSetup, _, TIMER_FLAG_NO_MAPCHANGE);
@@ -647,7 +645,7 @@ public Action Timer_CheckReady(Handle timer) {
 
       } else {
         g_LiveTimerRunning = false;
-        PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, neededPlayers,
+        PrintHintTextToAll("%t\n%t", "ReadyStatusPlayers", readyPlayers, totalPlayers,
                            "ReadyStatusAllReadyVote");
         PugSetup_MessageToAll("%t", "VoteMessage");
         CreateTimer(2.0, MapSetup, _, TIMER_FLAG_NO_MAPCHANGE);
@@ -665,7 +663,7 @@ public Action Timer_CheckReady(Handle timer) {
   Call_Finish();
 
   if (g_TeamType == TeamType_Captains && g_AutoRandomizeCaptainsCvar.IntValue != 0 &&
-      totalPlayers >= neededPlayers) {
+      totalPlayers >= PugSetup_GetPugMaxPlayers()) {
     // re-randomize captains if they aren't set yet
     if (!IsPlayer(g_capt1)) {
       g_capt1 = RandomPlayer();