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

Implemented checks for availability of TOML files (refs #60)

Browse source
This commit is contained in:
Timo Smit 2019-01-03 11:10:35 +01:00
parent b4b2b9d2b0
commit da4fd9d235
2 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
luamods/wolfadmin/admin/rules.lua
View file

@ -42,21 +42,26 @@ function rules.load()
if string.find(fileName, ".toml") == string.len(fileName) - 4 then
local fileDescriptor, fileLength = et.trap_FS_FOpenFile(fileName, et.FS_READ)
local fileString = et.trap_FS_Read(fileDescriptor, fileLength)
et.trap_FS_FCloseFile(fileDescriptor)
if fileLength ~= -1 then
local fileString = et.trap_FS_Read(fileDescriptor, fileLength)
local fileTable = toml.parse(fileString)
et.trap_FS_FCloseFile(fileDescriptor)
local amount
local fileTable = toml.parse(fileString)
for _, rule in ipairs(fileTable["rule"]) do
if rule["shortcut"] and rule["rule"] then
data[rule["shortcut"]] = rule["rule"]
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
end
return amount
return 0
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)

43
luamods/wolfadmin/players/greetings.lua
View file

@ -90,31 +90,36 @@ function greetings.load()
if string.find(fileName, ".toml") == string.len(fileName) - 4 then
local fileDescriptor, fileLength = et.trap_FS_FOpenFile(fileName, et.FS_READ)
local fileString = et.trap_FS_Read(fileDescriptor, fileLength)
et.trap_FS_FCloseFile(fileDescriptor)
if fileLength ~= -1 then
local fileString = et.trap_FS_Read(fileDescriptor, fileLength)
local fileTable = toml.parse(fileString)
et.trap_FS_FCloseFile(fileDescriptor)
for _, greeting in ipairs(fileTable["level"]) do
if greeting["greeting"] then
levelGreetings[greeting["level"]] = {
["text"] = greeting["greeting"],
["sound"] = greeting["sound"]
}
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"]
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"]
return 0
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)