godotengine/godot-cpp
1
0
Fork 0
mirror of https://github.com/godotengine/godot-cpp.git synced 2026-01-06 06:10:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1253 from gilzoide/fix-variant-iteration-valid-flag

Browse Source 
Fix return value and `r_valid` value in `Variant::iter_init` and `Variant::iter_next`
This commit is contained in:
David Snopek
2023-10-20 10:39:05 -05:00
committed by GitHub
parent 5182624141 60dfa3445a
commit 0a6a19e33b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/variant/variant.cpp
View File

@@ -638,14 +638,16 @@ bool Variant::in(const Variant &index, bool *r_valid) const {
bool Variant::iter_init(Variant &r_iter, bool &r_valid) const { bool Variant::iter_init(Variant &r_iter, bool &r_valid) const {
GDExtensionBool valid; GDExtensionBool valid;
internal::gdextension_interface_variant_iter_init(_native_ptr(), r_iter._native_ptr(), &valid); GDExtensionBool result = internal::gdextension_interface_variant_iter_init(_native_ptr(), r_iter._native_ptr(), &valid);
return PtrToArg<bool>::convert(&valid); r_valid = PtrToArg<bool>::convert(&valid);
return PtrToArg<bool>::convert(&result);
} }
bool Variant::iter_next(Variant &r_iter, bool &r_valid) const { bool Variant::iter_next(Variant &r_iter, bool &r_valid) const {
GDExtensionBool valid; GDExtensionBool valid;
internal::gdextension_interface_variant_iter_next(_native_ptr(), r_iter._native_ptr(), &valid); GDExtensionBool result = internal::gdextension_interface_variant_iter_next(_native_ptr(), r_iter._native_ptr(), &valid);
return PtrToArg<bool>::convert(&valid); r_valid = PtrToArg<bool>::convert(&valid);
return PtrToArg<bool>::convert(&result);
} }
Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const { Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {