fixed disabling; display correct rounds left

TTT-2 · Sep 28, 2024 · be920de · be920de
1 parent 8bee53a
commit be920de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/gamemodes/terrortown/gamemode/client/vgui/cl_sb_main.lua b/gamemodes/terrortown/gamemode/client/vgui/cl_sb_main.lua
@@ -169,7 +169,7 @@ function PANEL:Init()
         if gameloop.HasLevelLimits() then
             local r, t = gameloop.UntilMapChange()
 
-            sf:SetText(GetPTranslation("sb_mapchange", { num = r, time = t }))
+            sf:SetText(GetPTranslation("sb_mapchange", { num = r + 1, time = t }))
         else
             sf:SetText(GetTranslation("sb_mapchange_disabled"))
         end

diff --git a/lua/ttt2/libraries/loadingscreen.lua b/lua/ttt2/libraries/loadingscreen.lua
@@ -70,7 +70,9 @@ function loadingscreen.End()
     end
 
     if SERVER then
-        local duration = loadingscreen.timeBegin - SysTime() + loadingscreen.GetDuration()
+        local duration = (loadingscreen.timeBegin or SysTime())
+            - SysTime()
+            + loadingscreen.GetDuration()
 
         -- this timer makes sure the loading screen is displayed for at least the
         -- time that is set as the minimum time
@@ -103,7 +105,11 @@ if SERVER then
     -- @return number The minimum time
     -- @realm server
     function loadingscreen.GetDuration()
-        return cvLoadingScreenMinDuration:GetFloat()
+        if cvLoadingScreenEnabled:GetBool() then
+            return cvLoadingScreenMinDuration:GetFloat()
+        else
+            return 0
+        end
     end
 end
 
@@ -229,7 +235,7 @@ if CLIENT then
 
             text = LANG.GetParamTranslation(
                 "loadingscreen_round_restart_subtitle_limits",
-                { map = game.GetMap(), rounds = roundsLeft, time = timeLeft }
+                { map = game.GetMap(), rounds = roundsLeft + 1, time = timeLeft }
             )
         else
             text = LANG.TryTranslation("loadingscreen_round_restart_subtitle")

diff --git a/lua/ttt2/libraries/tips.lua b/lua/ttt2/libraries/tips.lua
@@ -72,7 +72,7 @@ function tips.Initialize()
     tips.Register("tip31")
     tips.Register("tip32")
     tips.Register("tip33")
-    tips.Register("tip34", { helpkey = Key("+gm_showhelp", "F1") })
+    tips.Register("tip34")
     tips.Register("tip35")
     tips.Register("tip36")
     tips.Register("tip37")