From c1685fd11d97676d7f0bace693938b2f3e1625e5 Mon Sep 17 00:00:00 2001 From: Fesiug Date: Sun, 3 Dec 2023 23:24:50 -0500 Subject: [PATCH] ConVar name changes fixes --- gamemodes/benny/entities/weapons/benny/shared.lua | 4 ++-- gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gamemodes/benny/entities/weapons/benny/shared.lua b/gamemodes/benny/entities/weapons/benny/shared.lua index a7cce05..bce3b63 100644 --- a/gamemodes/benny/entities/weapons/benny/shared.lua +++ b/gamemodes/benny/entities/weapons/benny/shared.lua @@ -161,7 +161,7 @@ hook.Add( "PlayerButtonDown", "Benny_PlayerButtonDown_TempForAim", function( ply local wep = ply:BennyCheck() if button == KEY_F then - if tobool(ply:GetInfoNum("benny_toggleaim", 0)) then + if tobool(ply:GetInfoNum("benny_wep_toggleaim", 1)) then wep:SetUserAim( !wep:GetUserAim() ) else wep:SetUserAim( true ) @@ -182,7 +182,7 @@ hook.Add( "PlayerButtonUp", "Benny_PlayerButtonUp_TempForAim", function( ply, bu local wep = ply:BennyCheck() if button == KEY_F then - if !tobool(ply:GetInfoNum("benny_toggleaim", 0)) then + if !tobool(ply:GetInfoNum("benny_wep_toggleaim", 0)) then wep:SetUserAim( false ) end end diff --git a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua index 252ad00..b04e784 100644 --- a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua +++ b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua @@ -180,13 +180,13 @@ do -- Toolgun local List = Frame:Add( "DComboBox" ) List:Dock( TOP ) - List:SetValue(GetConVar("benny_toolgun"):GetString()) + List:SetValue(GetConVar("benny_wep_toolgun"):GetString()) List:DockMargin( 10, 0, 10, 0 ) for i, v in SortedPairs( ToolGunTools ) do List:AddChoice( i ) end List.OnSelect = function( self, index, value ) - RunConsoleCommand( "benny_toolgun", value ) + RunConsoleCommand( "benny_wep_toolgun", value ) Frame:Remove() end end @@ -211,7 +211,7 @@ do -- Toolgun local p = self:GetOwner() local tr = p:GetEyeTrace() - local tool = p:GetInfo( "benny_toolgun" ) + local tool = p:GetInfo( "benny_wep_toolgun" ) if ToolGunTools[tool] then ToolGunTools[tool]( self, p, tr ) end if CLIENT and IsFirstTimePredicted() then @@ -228,7 +228,7 @@ do -- Toolgun end, Custom_Reload = function( self, data ) - if CLIENT and self:GetOwner():KeyPressed( IN_RELOAD ) then + if CLIENT then CreateSelect() end