disable X frags left announcements

they do poorly with upscaled score counters

diff --git a/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc b/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
index 8a3ba5349454c6f4bb0fcf89b6b2d12d0824281c..ac5b4b6cd83bca3582ddb8988e4da00b085d29ea 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
+++ b/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
@@ -45,8 +45,12 @@ void mayhem_Initialize()
 
 MUTATOR_HOOKFUNCTION(mayhem, Scores_CountFragsRemaining)
 {
-       // announce remaining frags
-       return true;
+       // do not announce remaining frags, upscaled score count doesn't match well with this
+       // when scorelimit is set to 1000 it would announce 997, 998 and 999 score counts
+       // usually a single shot which deals ~40-80 dmg gives 2 or 3 score
+       // this usually would cause a "2 fra..." announcement to be played as the match ends 
+       // without leaving anyone time to even process the announcement
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(mayhem, SetStartItems)

diff --git a/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc
index 397c76c555ec3931731975f302b276a9c5c7873d..3ac2950d94c7ee51abd833af2852fc50d87bd46b 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc
+++ b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc
@@ -88,8 +88,12 @@ MUTATOR_HOOKFUNCTION(tmayhem, TeamBalance_CheckAllowedTeams, CBC_ORDER_EXCLUSIVE
 
 MUTATOR_HOOKFUNCTION(tmayhem, Scores_CountFragsRemaining)
 {
-       // announce remaining frags
-       return true;
+       // do not announce remaining frags, upscaled score count doesn't match well with this
+       // when scorelimit is set to 1000 it would announce 997, 998 and 999 score counts
+       // usually a single shot which deals ~40-80 dmg gives 2 or 3 score
+       // this usually would cause a "2 fra..." announcement to be played as the match ends 
+       // without leaving anyone time to even process the announcement
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(tmayhem, SetStartItems)