Bennydev
/
Benny
3
0
Fork 0
Code Issues Pull Requests Wiki Activity

ConVar name changes fixes

This commit is contained in:
Fesiug 2023-12-03 23:24:50 -05:00
parent 8d35a71089
commit c1685fd11d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gamemodes/benny/entities/weapons/benny/shared.lua
View File

@ -161,7 +161,7 @@ hook.Add( "PlayerButtonDown", "Benny_PlayerButtonDown_TempForAim", function( ply
local wep = ply:BennyCheck() local wep = ply:BennyCheck()
if button == KEY_F then 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() ) wep:SetUserAim( !wep:GetUserAim() )
else else
wep:SetUserAim( true ) wep:SetUserAim( true )
@ -182,7 +182,7 @@ hook.Add( "PlayerButtonUp", "Benny_PlayerButtonUp_TempForAim", function( ply, bu
local wep = ply:BennyCheck() local wep = ply:BennyCheck()
if button == KEY_F then 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 ) wep:SetUserAim( false )
end end
end end

8
gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua
View File

@ -180,13 +180,13 @@ do -- Toolgun
local List = Frame:Add( "DComboBox" ) local List = Frame:Add( "DComboBox" )
List:Dock( TOP ) List:Dock( TOP )
List:SetValue(GetConVar("benny_toolgun"):GetString()) List:SetValue(GetConVar("benny_wep_toolgun"):GetString())
List:DockMargin( 10, 0, 10, 0 ) List:DockMargin( 10, 0, 10, 0 )
for i, v in SortedPairs( ToolGunTools ) do for i, v in SortedPairs( ToolGunTools ) do
List:AddChoice( i ) List:AddChoice( i )
end end
List.OnSelect = function( self, index, value ) List.OnSelect = function( self, index, value )
RunConsoleCommand( "benny_toolgun", value ) RunConsoleCommand( "benny_wep_toolgun", value )
Frame:Remove() Frame:Remove()
end end
end end
@ -211,7 +211,7 @@ do -- Toolgun
local p = self:GetOwner() local p = self:GetOwner()
local tr = p:GetEyeTrace() 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 ToolGunTools[tool] then ToolGunTools[tool]( self, p, tr ) end
if CLIENT and IsFirstTimePredicted() then if CLIENT and IsFirstTimePredicted() then
@ -228,7 +228,7 @@ do -- Toolgun
end, end,
Custom_Reload = function( self, data ) Custom_Reload = function( self, data )
if CLIENT and self:GetOwner():KeyPressed( IN_RELOAD ) then if CLIENT then
CreateSelect() CreateSelect()
end end