Keep g_settings as a 'static' variable rather than a direct object.

This commit is contained in:
BenDol
2014-04-01 16:51:38 +13:00
parent b295053662
commit 79ee0e34ea
18 changed files with 174 additions and 99 deletions

View File

@@ -84,7 +84,7 @@ end
function init()
for k,v in pairs(defaultOptions) do
g_settings:setDefault(k, v)
g_settings.setDefault(k, v)
options[k] = v
end
@@ -129,9 +129,9 @@ function setup()
-- load options
for k,v in pairs(defaultOptions) do
if type(v) == 'boolean' then
setOption(k, g_settings:getBoolean(k), true)
setOption(k, g_settings.getBoolean(k), true)
elseif type(v) == 'number' then
setOption(k, g_settings:getNumber(k), true)
setOption(k, g_settings.getNumber(k), true)
end
end
end
@@ -243,7 +243,7 @@ function setOption(key, value, force)
end
end
g_settings:set(key, value)
g_settings.set(key, value)
options[key] = value
end