diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-11-07 16:34:54 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 16:34:54 -0300 |
| commit | 30b6db99a99a94c64d906c1b828ff44f79a1bc75 (patch) | |
| tree | 0c33e76f2effa5dcb48a7443ae888c20cbda1e44 /modules/gdscript | |
| parent | 709964849fdc0c2cb34e5e851df71a66ee28ba1e (diff) | |
| parent | 05de7ce6caf441f8b64dd60d1837835f10d06520 (diff) | |
Merge pull request #43371 from reduz/variant-setget-refactor
Refactored Variant setters/getters
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gdscript_analyzer.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_function.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index ab4edb04b9..e152bfb1eb 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -2438,7 +2438,7 @@ void GDScriptAnalyzer::reduce_subscript(GDScriptParser::SubscriptNode *p_subscri if (p_subscript->base->is_constant) { // Just try to get it. bool valid = false; - Variant value = p_subscript->base->reduced_value.get_named(p_subscript->attribute->name, &valid); + Variant value = p_subscript->base->reduced_value.get_named(p_subscript->attribute->name, valid); if (!valid) { push_error(vformat(R"(Cannot get member "%s" from "%s".)", p_subscript->attribute->name, p_subscript->base->reduced_value), p_subscript->index); } else { diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp index 1da0e7b4c6..30d0049d47 100644 --- a/modules/gdscript/gdscript_function.cpp +++ b/modules/gdscript/gdscript_function.cpp @@ -620,7 +620,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a const StringName *index = &_global_names_ptr[indexname]; bool valid; - dst->set_named(*index, *value, &valid); + dst->set_named(*index, *value, valid); #ifdef DEBUG_ENABLED if (!valid) { @@ -647,10 +647,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a bool valid; #ifdef DEBUG_ENABLED //allow better error message in cases where src and dst are the same stack position - Variant ret = src->get_named(*index, &valid); + Variant ret = src->get_named(*index, valid); #else - *dst = src->get_named(*index, &valid); + *dst = src->get_named(*index, valid); #endif #ifdef DEBUG_ENABLED if (!valid) { |