metrostroi-repo/MetrostroiAddon
1
0
Fork 0
mirror of https://github.com/metrostroi-repo/MetrostroiAddon.git synced 2026-05-02 00:42:29 +00:00
Code Activity

#199 (#267)

Browse Source 
* Global change.
Замена всех устаревших функции на аналогичные

* Global change.
Добавил локальные переменные там, где это было рентабельно.
This commit is contained in:
Ivan Gordeev
2021-07-26 09:18:18 +03:00
committed by GitHub
parent 4a2786967d
commit 373073e661
29 changed files with 121 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lua/entities/gmod_train_spawner/cl_init.lua
View File

@@ -86,10 +86,10 @@ local function CreateList(name,text,tbl,OnSelect,stbl)
end
List.ID = table.insert(VGUI,function(val, disabled, reset)
if reset then
if List.Disable then List:SetDisabled(false) end
if List.Disable then List:SetEnabled(true) end
elseif val or disabled then
if val ~= nil then List:ChooseOptionID(val) end
List:SetDisabled(disabled)
List:SetEnabled(not disabled)
List.Disable = disabled
else
ListLabel:Remove()
@@ -138,12 +138,12 @@ local function CreateSlider(name,decimals,min,max,text,OnSelect,stbl)
end
Slider.ID = table.insert(VGUI,function(val, disabled, reset)
if reset then
if Slider.Disable then Slider:SetDisabled(false) Slider.Disable = nil end
if Slider.Disable then Slider:SetEnabled(true) Slider.Disable = nil end
return
end
if val or disabled then
if val ~= nil then Slider:SetValue(val) end
Slider:SetDisabled(disabled)
Slider:SetEnabled(not disabled)
Slider.Disable = disabled
return
end
@@ -183,12 +183,12 @@ local function CreateCheckBox(name,text,OnSelect,stbl)
end
CB.ID = table.insert(VGUI,function(val, disabled, reset)
if reset then
if CB.Disable then CB:SetDisabled(false) CB.Disable = nil end
if CB.Disable then CB:SetEnabled(true) CB.Disable = nil end
return
end
if val or disabled then
if val ~= nil then CB:SetValue(val) end
CB:SetDisabled(disabled)
CB:SetEnabled(not disabled)
CB.Disable = disabled
return
end
@@ -521,7 +521,7 @@ end
local function createFrame()
MaxWagons = GetGlobalInt("metrostroi_maxtrains")*GetGlobalInt("metrostroi_maxwagons")
MaxWagonsOnPlayer = GetGlobalInt("metrostroi_maxtrains_onplayer")*GetGlobalInt("metrostroi_maxwagons")
--if GetConVarString("gmod_toolmode") == "train_spawner" then RunConsoleCommand("gmod_toolmode", "weld") end
--if GetConVar("gmod_toolmode"):GetString() == "train_spawner" then RunConsoleCommand("gmod_toolmode", "weld") end
if IsValid(frame) then return end
Pos = 0
VGUI = {}
@@ -564,7 +564,7 @@ local function createFrame()
spawn.DoClick = function()
--[[
local Tool = GetConVarString("gmod_toolmode")
local Tool = GetConVar("gmod_toolmode"):GetString()
if Tool == "train_spawner" then Tool = "weld" end
RunConsoleCommand("train_spawner_oldT", Tool)
RunConsoleCommand("train_spawner_oldW", LocalPlayer():GetActiveWeapon():GetClass())

6
lua/entities/gmod_train_spawner/init.lua
View File

@@ -9,9 +9,9 @@ CreateConVar("metrostroi_maxtrains",3,{FCVAR_ARCHIVE},"Maximum of allowed trains
CreateConVar("metrostroi_maxwagons",3,{FCVAR_ARCHIVE},"Maximum of allowed wagons in 1 train")
CreateConVar("metrostroi_maxtrains_onplayer",1,{FCVAR_ARCHIVE},"Maximum of allowed trains by player")
local function MaxWagonsChangeCallback()
SetGlobalInt("metrostroi_maxtrains",GetConVarNumber("metrostroi_maxtrains"))
SetGlobalInt("metrostroi_maxtrains_onplayer",GetConVarNumber("metrostroi_maxtrains_onplayer"))
SetGlobalInt("metrostroi_maxwagons",GetConVarNumber("metrostroi_maxwagons"))
SetGlobalInt("metrostroi_maxtrains",GetConVar("metrostroi_maxtrains"):GetInt())
SetGlobalInt("metrostroi_maxtrains_onplayer",GetConVar("metrostroi_maxtrains_onplayer"):GetInt())
SetGlobalInt("metrostroi_maxwagons",GetConVar("metrostroi_maxwagons"):GetInt())
timer.Simple(0,function()
net.Start("MetrostroiMaxWagons")
net.Broadcast()