etlegacy/wolfadmin
0
0
Fork 0
mirror of https://github.com/etlegacy/wolfadmin.git synced 2025-04-16 13:51:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved file existence checks for rules and greetings to match sprees code

Browse source
This commit is contained in:
Timo Smit 2019-01-17 11:16:26 +01:00
parent 415835c723
commit 6d3197413a
2 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
luascripts/wolfadmin/admin/rules.lua
View file

@ -44,24 +44,24 @@ function rules.load()
local fileDescriptor, fileLength = et.trap_FS_FOpenFile(fileName, et.FS_READ)
if fileLength ~= -1 then
local fileString = et.trap_FS_Read(fileDescriptor, fileLength)
et.trap_FS_FCloseFile(fileDescriptor)
local fileTable = toml.parse(fileString)
local amount
for _, rule in ipairs(fileTable["rule"]) do
if rule["shortcut"] and rule["rule"] then
data[rule["shortcut"]] = rule["rule"]
end
end
return amount
return 0
end
return 0
local fileString = et.trap_FS_Read(fileDescriptor, fileLength)
et.trap_FS_FCloseFile(fileDescriptor)
local fileTable = toml.parse(fileString)
local amount
for _, rule in ipairs(fileTable["rule"]) do
if rule["shortcut"] and rule["rule"] then
data[rule["shortcut"]] = rule["rule"]
end
end
return amount
else
-- compatibility for 1.1.* and lower
outputDebug("Using .cfg files is deprecated as of 1.2.0. Please consider updating to .toml files.", 3)

54
luascripts/wolfadmin/players/greetings.lua
View file

@ -93,35 +93,35 @@ function greetings.load()
if string.find(fileName, ".toml") == string.len(fileName) - 4 then
local fileDescriptor, fileLength = et.trap_FS_FOpenFile(fileName, et.FS_READ)
if fileLength ~= -1 then
local fileString = et.trap_FS_Read(fileDescriptor, fileLength)
et.trap_FS_FCloseFile(fileDescriptor)
local fileTable = toml.parse(fileString)
for _, greeting in ipairs(fileTable["level"]) do
if greeting["greeting"] then
levelGreetings[greeting["level"]] = {
["text"] = greeting["greeting"],
["sound"] = greeting["sound"]
}
end
end
for _, greeting in ipairs(fileTable["user"]) do
if greeting["greeting"] then
userGreetings[greeting["guid"]] = {
["text"] = greeting["greeting"],
["sound"] = greeting["sound"]
}
end
end
return #fileTable["level"] + #fileTable["user"]
if fileLength == -1 then
return 0
end
return 0
local fileString = et.trap_FS_Read(fileDescriptor, fileLength)
et.trap_FS_FCloseFile(fileDescriptor)
local fileTable = toml.parse(fileString)
for _, greeting in ipairs(fileTable["level"]) do
if greeting["greeting"] then
levelGreetings[greeting["level"]] = {
["text"] = greeting["greeting"],
["sound"] = greeting["sound"]
}
end
end
for _, greeting in ipairs(fileTable["user"]) do
if greeting["greeting"] then
userGreetings[greeting["guid"]] = {
["text"] = greeting["greeting"],
["sound"] = greeting["sound"]
}
end
end
return #fileTable["level"] + #fileTable["user"]
else
-- compatibility for 1.1.* and lower
outputDebug("Using .cfg files is deprecated as of 1.2.0. Please consider updating to .toml files.", 3)