diff options
| author | Juan Linietsky <red@kyoko> | 2015-05-11 15:49:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <red@kyoko> | 2015-05-11 15:49:41 -0300 |
| commit | 4b8745ad63409cf14b02735981ee35d2f794421c (patch) | |
| tree | 607dcfbb77430e8ed7eef25de6b7bec9c4032aec /core/io/resource_format_xml.cpp | |
| parent | dda60296d81edaabfdb56f47a2c949b5dad283fb (diff) | |
| parent | b777bf5ff5c3891daa0f93987ca12d0d7d053c2b (diff) | |
| download | redot-engine-4b8745ad63409cf14b02735981ee35d2f794421c.tar.gz | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core/io/resource_format_xml.cpp')
| -rw-r--r-- | core/io/resource_format_xml.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp index 5922d83907..3e625ba6fd 100644 --- a/core/io/resource_format_xml.cpp +++ b/core/io/resource_format_xml.cpp @@ -309,6 +309,7 @@ Error ResourceInteractiveLoaderXML::_parse_array_element(Vector<char> &buff,bool buff_max++; buff.resize(buff_max); + buffptr=buff.ptr(); } @@ -1849,7 +1850,7 @@ void ResourceFormatSaverXMLInstance::escape(String& p_str) { p_str=p_str.replace(">","<"); p_str=p_str.replace("'","'"); p_str=p_str.replace("\"","""); - for (int i=1;i<32;i++) { + for (char i=1;i<32;i++) { char chr[2]={i,0}; const char hexn[16]={'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; @@ -2563,7 +2564,7 @@ Error ResourceFormatSaverXMLInstance::save(const String &p_path,const RES& p_res List<PropertyInfo> property_list; res->get_property_list(&property_list); - property_list.sort(); +// property_list.sort(); for(List<PropertyInfo>::Element *PE = property_list.front();PE;PE=PE->next()) { |