diff options
author | David Walter Seikel | 2014-04-18 00:37:17 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-04-18 00:37:17 +1000 |
commit | 8e06e56e16183c18b01bf6941fde8c35b5562655 (patch) | |
tree | be350cd2d49bb52fbf9442ba9e70cfedab848b94 /ClientHamr/GuiLua/skang.lua | |
parent | Convert test_c to use GuiLua. (diff) | |
download | SledjHamr-8e06e56e16183c18b01bf6941fde8c35b5562655.zip SledjHamr-8e06e56e16183c18b01bf6941fde8c35b5562655.tar.gz SledjHamr-8e06e56e16183c18b01bf6941fde8c35b5562655.tar.bz2 SledjHamr-8e06e56e16183c18b01bf6941fde8c35b5562655.tar.xz |
Merge the widget module into the skang module, and some related clean ups.
So now the skang module is a mix of C and Lua.
Diffstat (limited to 'ClientHamr/GuiLua/skang.lua')
-rw-r--r-- | ClientHamr/GuiLua/skang.lua | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ClientHamr/GuiLua/skang.lua b/ClientHamr/GuiLua/skang.lua index 1357b69..88bd6fb 100644 --- a/ClientHamr/GuiLua/skang.lua +++ b/ClientHamr/GuiLua/skang.lua | |||
@@ -977,6 +977,12 @@ set = function (stuff, key, name, value) | |||
977 | end | 977 | end |
978 | end | 978 | end |
979 | 979 | ||
980 | |||
981 | -- Get our C functions installed into skang. | ||
982 | -- This has to be after thingasm is defined. | ||
983 | local GuiLua = require 'libGuiLua' | ||
984 | |||
985 | |||
980 | thingasm('module,l', 'Load a module.', module, 'file') | 986 | thingasm('module,l', 'Load a module.', module, 'file') |
981 | thingasm('get', 'Get the current value of an existing Thing or metadata.', get, 'thing,key,name') | 987 | thingasm('get', 'Get the current value of an existing Thing or metadata.', get, 'thing,key,name') |
982 | thingasm('reset', 'Reset the current value of an existing Thing or metadata.', reset, 'thing,key,name') | 988 | thingasm('reset', 'Reset the current value of an existing Thing or metadata.', reset, 'thing,key,name') |