Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Load Scenographic Editor lua files

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
ulukyn@gmail.com 2016-12-14 16:14:33 +01:00
parent 6ff3cc9d77
commit 6238139c08
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/ryzom/client/data/gamedev/interfaces_v3/json.lua
View file

@ -7,7 +7,7 @@
-- under the terms of the MIT license. See LICENSE for details. -- under the terms of the MIT license. See LICENSE for details.
-- --
local json = { _version = "0.1.0" } Json = { _version = "0.1.0" }
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- Encode -- Encode
@ -368,12 +368,9 @@ parse = function(str, idx)
end end
function json.decode(str) function Json.decode(str)
if type(str) ~= "string" then if type(str) ~= "string" then
error("expected argument of type string, got " .. type(str)) error("expected argument of type string, got " .. type(str))
end end
return ( parse(str, next_char(str, 1, space_chars, true)) ) return ( parse(str, next_char(str, 1, space_chars, true)) )
end end
return json

2
code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
View file

@ -4,6 +4,8 @@
<interface_config> <interface_config>
<root id="interface" x="0" y="0" w="800" h="600" active="true" /> <root id="interface" x="0" y="0" w="800" h="600" active="true" />
<lua file="webig.lua" /> <lua file="webig.lua" />
<lua file="json.lua" />
<lua file="sceneedit.lua" />
<!-- //////////// STYLE : webigchat_desc /////////// --> <!-- //////////// STYLE : webigchat_desc /////////// -->
<style style="webigchat_desc" type="text" fontsize="12" justification="dont_clip_word" color="0 0 0 255" global_color="false" multi_line="true" multi_line_space="0" line_maxw="320" multi_line_maxw_only="true" /> <style style="webigchat_desc" type="text" fontsize="12" justification="dont_clip_word" color="0 0 0 255" global_color="false" multi_line="true" multi_line_space="0" line_maxw="320" multi_line_maxw_only="true" />