diff --git a/RELEASE.md b/RELEASE.md index 8ce64ed9..3df897d7 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -6,6 +6,8 @@ ### Fixes - Ported "Fix drive system not working fully in TTT" - Fixed error using the roleweapons UI and the weapons tab of the rolepacks UI due to recent changes in shop sorting +- Fixed crosshair size sometimes not going back to the old size when sprinting + - Fixes crosshair growing into crazy sizes ### Developer - Added `TTTPlayerPassesTraitorCheck` to allow override traitor tester logic diff --git a/gamemodes/terrortown/entities/weapons/weapon_tttbase.lua b/gamemodes/terrortown/entities/weapons/weapon_tttbase.lua index 78beac00..6ed7ce5a 100644 --- a/gamemodes/terrortown/entities/weapons/weapon_tttbase.lua +++ b/gamemodes/terrortown/entities/weapons/weapon_tttbase.lua @@ -189,7 +189,11 @@ if CLIENT then local bright = crosshair_brightness:GetFloat() or 1 gap = gap or math.floor(20 * scale * (sights and 0.8 or 1)) - local length = math.floor(gap + (25 * crosshair_size:GetFloat()) * scale) + local size = crosshair_size:GetFloat() + if client.GetSprinting and client:GetSprinting() then + size = size + 1 + end + local length = math.floor(gap + (25 * size) * scale) local thickness = math.max(1, crosshair_thickness:GetInt()) local rect = thickness > 1 diff --git a/gamemodes/terrortown/gamemode/cl_init.lua b/gamemodes/terrortown/gamemode/cl_init.lua index 30db81c8..4c7264c5 100644 --- a/gamemodes/terrortown/gamemode/cl_init.lua +++ b/gamemodes/terrortown/gamemode/cl_init.lua @@ -80,7 +80,6 @@ include("cl_roleblocks.lua") include("cl_roleweapons.lua") include("cl_hitmarkers.lua") include("cl_deathnotify.lua") -include("cl_sprint.lua") include("cl_cheatsheet.lua") include("cl_sync.lua") diff --git a/gamemodes/terrortown/gamemode/cl_sprint.lua b/gamemodes/terrortown/gamemode/cl_sprint.lua deleted file mode 100644 index 2237c4f7..00000000 --- a/gamemodes/terrortown/gamemode/cl_sprint.lua +++ /dev/null @@ -1,26 +0,0 @@ -local hook = hook - -local AddHook = hook.Add - -local crosshairSize = nil -local sizeConvar = nil - -AddHook("TTTSprintStateChange", "Sprinting_Crosshair_TTTSprintStateChange", function(ply, sprinting, _) - if ply ~= LocalPlayer() then return end - if sprinting and crosshairSize ~= nil then return end - - if not sizeConvar then - sizeConvar = GetConVar("ttt_crosshair_size") - end - - -- Sanity check - if not sizeConvar then return end - - if sprinting then - crosshairSize = sizeConvar:GetFloat() - sizeConvar:SetFloat(crosshairSize + 1) - elseif crosshairSize then - sizeConvar:SetFloat(crosshairSize) - crosshairSize = nil - end -end) \ No newline at end of file diff --git a/gamemodes/terrortown/gamemode/init.lua b/gamemodes/terrortown/gamemode/init.lua index 4c226589..84b7608c 100644 --- a/gamemodes/terrortown/gamemode/init.lua +++ b/gamemodes/terrortown/gamemode/init.lua @@ -46,7 +46,6 @@ AddCSLuaFile("vgui/sb_team.lua") AddCSLuaFile("vgui/sb_info.lua") AddCSLuaFile("cl_hitmarkers.lua") AddCSLuaFile("cl_deathnotify.lua") -AddCSLuaFile("cl_sprint.lua") AddCSLuaFile("sprint_shd.lua") AddCSLuaFile("cl_cheatsheet.lua") AddCSLuaFile("cl_sync.lua")