Cherry/3D2D-Textscreens
1
0
Fork 0
mirror of https://github.com/Cherry/3D2D-Textscreens.git synced 2025-03-04 03:13:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename some variables for consistency

Browse Source 
chore: bump glualint version
This commit is contained in:
James Ross 2021-06-05 14:01:30 +01:00
parent a9e7e93299
commit 0f76a7acd9
No known key found for this signature in database
GPG Key ID: 49E8B07166BE49AB
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/lint.yml vendored
View File

@ -10,7 +10,7 @@ jobs:
- name: Download GLuaLint
run: curl -o glualint.zip -L https://github.com/FPtje/GLuaFixer/releases/download/$GLUALINT_VERSION/glualint-$GLUALINT_VERSION-linux.zip
env:
GLUALINT_VERSION: 1.17.3
GLUALINT_VERSION: 1.18.1
- name: Unzip GLuaLint
run: unzip glualint.zip
- name: Lint lua files

1
.glualint.json
View File

@ -14,6 +14,7 @@
"lint_unusedVars": true,
"lint_unusedParameters": false,
"lint_unusedLoopVars": false,
"lint_inconsistentVariableStyle": false,
"prettyprint_spaceAfterParens": false,
"prettyprint_spaceAfterBrackets": false,
"prettyprint_spaceAfterBraces": false,

20
lua/weapons/gmod_tool/stools/textscreen.lua
View File

@ -88,11 +88,11 @@ end
function TOOL:RightClick(tr)
if (tr.Entity:GetClass() == "player") then return false end
if (CLIENT) then return true end
local TraceEnt = tr.Entity
local traceEnt = tr.Entity
if (IsValid(TraceEnt) and TraceEnt:GetClass() == "sammyservers_textscreen") then
if (IsValid(TraceEnt) and traceEnt:GetClass() == "sammyservers_textscreen") then
for i = 1, 5 do
TraceEnt:SetLine(
traceEnt:SetLine(
i, -- Line
tostring(self:GetClientInfo("text" .. i)), -- text
Color( -- Color
@ -109,18 +109,18 @@ function TOOL:RightClick(tr)
)
end
TraceEnt:Broadcast()
traceEnt:Broadcast()
return true
end
end
function TOOL:Reload(tr)
local TraceEnt = tr.Entity
if (not isentity(TraceEnt) or TraceEnt:GetClass() ~= "sammyservers_textscreen") then return false end
local traceEnt = tr.Entity
if (not isentity(traceEnt) or traceEnt:GetClass() ~= "sammyservers_textscreen") then return false end
for i = 1, 5 do
local linedata = TraceEnt.lines[i]
local linedata = traceEnt.lines[i]
RunConsoleCommand("textscreen_r" .. i, linedata.color.r)
RunConsoleCommand("textscreen_g" .. i, linedata.color.g)
RunConsoleCommand("textscreen_b" .. i, linedata.color.b)
@ -134,7 +134,7 @@ function TOOL:Reload(tr)
return true
end
local ConVarsDefault = TOOL:BuildConVarList()
local conVarsDefault = TOOL:BuildConVarList()
function TOOL.BuildCPanel(CPanel)
local logo = vgui.Create("DImage", CPanel)
@ -318,9 +318,9 @@ function TOOL.BuildCPanel(CPanel)
MenuButton = 1,
Folder = "textscreen",
Options = {
["#preset.default"] = ConVarsDefault
["#preset.default"] = conVarsDefault
},
CVars = table.GetKeys(ConVarsDefault)
CVars = table.GetKeys(conVarsDefault)
})
for i = 1, 5 do