Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Style: Enforce braces around if blocks and loops

Browse source 
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
This commit is contained in:
Rémi Verschelde 2020-05-14 16:41:43 +02:00
parent 07bc4e2f96
commit 0ee0fa42e6
683 changed files with 22803 additions and 12225 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scene/main/instance_placeholder.cpp
View file

@ -74,20 +74,24 @@ Node *InstancePlaceholder::create_instance(bool p_replace, const Ref<PackedScene
ERR_FAIL_COND_V(!is_inside_tree(), nullptr);
Node *base = get_parent();
if (!base)
if (!base) {
return nullptr;
}
Ref<PackedScene> ps;
if (p_custom_scene.is_valid())
if (p_custom_scene.is_valid()) {
ps = p_custom_scene;
else
} else {
ps = ResourceLoader::load(path, "PackedScene");
}
if (!ps.is_valid())
if (!ps.is_valid()) {
return nullptr;
}
Node *scene = ps->instance();
if (!scene)
if (!scene) {
return nullptr;
}
scene->set_name(get_name());
int pos = get_index();
@ -112,12 +116,14 @@ Dictionary InstancePlaceholder::get_stored_values(bool p_with_order) {
for (List<PropSet>::Element *E = stored_values.front(); E; E = E->next()) {
ret[E->get().name] = E->get().value;
if (p_with_order)
if (p_with_order) {
order.push_back(E->get().name);
}
};
if (p_with_order)
if (p_with_order) {
ret[".order"] = order;
}
return ret;
};