godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Godot 2.1 to 3.0 conversion should be more or less final

Browse Source
This commit is contained in:
Juan Linietsky
2017-02-15 08:29:11 -03:00
parent ebb7d2cdb7
commit d5c2a6b76b
4 changed files with 612 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/io/resource_format_binary.cpp
View File

@@ -467,10 +467,10 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v,bool p_for_exp
} break;
case VARIANT_DICTIONARY: {
uint32_t len=f->get_32();
Dictionary d(len&0x80000000); //last bit means shared
len&=0x7FFFFFFF;
for(uint32_t i=0;i<len;i++) {
uint32_t len=f->get_32();
Dictionary d(len&0x80000000); //last bit means shared
len&=0x7FFFFFFF;
for(uint32_t i=0;i<len;i++) {
Variant key;
Error err = parse_variant(key,p_for_export_data);
ERR_FAIL_COND_V(err,ERR_FILE_CORRUPT);
@@ -483,11 +483,11 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant& r_v,bool p_for_exp
} break;
case VARIANT_ARRAY: {
uint32_t len=f->get_32();
Array a(len&0x80000000); //last bit means shared
len&=0x7FFFFFFF;
uint32_t len=f->get_32();
Array a(len&0x80000000); //last bit means shared
len&=0x7FFFFFFF;
a.resize(len);
for(uint32_t i=0;i<len;i++) {
for(uint32_t i=0;i<len;i++) {
Variant val;
Error err = parse_variant(val,p_for_export_data);
ERR_FAIL_COND_V(err,ERR_FILE_CORRUPT);