bitsquid_dt/Darktide-Mod-Framework
bitsquid_dt/Darktide-Mod-Framework
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

Commands: Replace command_entry with command_data

Browse source
This commit is contained in:
FireSiku 2018-06-06 19:24:21 -04:00
parent 17505f0864
commit d9f3dd6c55
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
vmf/scripts/mods/vmf/modules/core/commands.lua
View file

@ -30,9 +30,10 @@ VMFMod.command = function (self, command_name, command_description, command_func
command_name = command_name:lower() command_name = command_name:lower()
if _commands[command_name] and _commands[command_name].mod ~= self then local command_data = _commands[command_name]
if command_data and command_data.mod ~= self then
self:error("(command): command name '%s' is already used by another mod '%s'", self:error("(command): command name '%s' is already used by another mod '%s'",
command_name, _commands[command_name].mod:get_name()) command_name, command_data.mod:get_name())
return return
end end
@ -81,8 +82,8 @@ end
VMFMod.remove_all_commands = function (self) VMFMod.remove_all_commands = function (self)
for command_name, command_entry in pairs(_commands) do for command_name, command_data in pairs(_commands) do
if command_entry.mod == self then if command_data.mod == self then
_commands[command_name] = nil _commands[command_name] = nil
end end
end end
@ -90,18 +91,18 @@ end
VMFMod.disable_all_commands = function (self) VMFMod.disable_all_commands = function (self)
for _, command_entry in pairs(_commands) do for _, command_data in pairs(_commands) do
if command_entry.mod == self then if command_data.mod == self then
command_entry.is_enabled = false command_data.is_enabled = false
end end
end end
end end
VMFMod.enable_all_commands = function (self) VMFMod.enable_all_commands = function (self)
for _, command_entry in pairs(_commands) do for _, command_data in pairs(_commands) do
if command_entry.mod == self then if command_data.mod == self then
command_entry.is_enabled = true command_data.is_enabled = true
end end
end end
end end
@ -116,19 +117,21 @@ vmf.get_commands_list = function(name_contains, exact_match)
local commands_list = {} local commands_list = {}
for command_name, command_entry in pairs(_commands) do for command_name, command_data in pairs(_commands) do
if exact_match then if exact_match then
if command_name == name_contains and command_entry.is_enabled then
table.insert(commands_list, {name = command_name, description = command_entry.description}) if command_name == name_contains and command_data.is_enabled then
table.insert(commands_list, {name = command_name, description = command_data.description})
break break
end end
else else
local command_match = ( string.sub(command_name, 1, string.len(name_contains)) == name_contains ) local command_match = ( string.sub(command_name, 1, string.len(name_contains)) == name_contains )
if command_match and command_entry.is_enabled and command_entry.mod:is_enabled() then if command_match and command_data.is_enabled and command_data.mod:is_enabled() then
table.insert(commands_list, {name = command_name, description = command_entry.description}) table.insert(commands_list, {name = command_name, description = command_data.description})
end end
end end
end end
table.sort(commands_list, function(a, b) return a.name < b.name end) table.sort(commands_list, function(a, b) return a.name < b.name end)
@ -139,10 +142,10 @@ end
vmf.run_command = function(command_name, ...) vmf.run_command = function(command_name, ...)
local command_entry = _commands[command_name] local command_data = _commands[command_name]
if command_entry then if command_data then
local error_prefix = "(commands) " .. tostring(command_name) local error_prefix = "(commands) " .. tostring(command_name)
vmf.xpcall_no_return_values(command_entry.mod, error_prefix, command_entry.exec_function, ...) vmf.xpcall_no_return_values(command_data.mod, error_prefix, command_data.exec_function, ...)
else else
vmf:error("(commands): command '%s' wasn't found.", command_name) -- should never see this vmf:error("(commands): command '%s' wasn't found.", command_name) -- should never see this
end end