diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-23 00:06:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-23 00:06:29 +0200 |
| commit | bc3c9a3c2aea7a4781f1319d05056ad8db19178e (patch) | |
| tree | a666374b1a0a26fb7cbbccc0549c83a898925c8f /modules | |
| parent | 172519bec6499d2d7b52875c1bfb685c7df2278f (diff) | |
| parent | baa94a375858e80bf9424fd895e3384edb4e114c (diff) | |
Merge pull request #10555 from Rubonnek/removed-unnecessary-returns-and-breaks
Removed unnecessary returns and break statements
[ci skip]
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gd_function.h | 3 | ||||
| -rw-r--r-- | modules/gdscript/gd_script.cpp | 3 | ||||
| -rw-r--r-- | modules/visual_script/visual_script_expression.cpp | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/modules/gdscript/gd_function.h b/modules/gdscript/gd_function.h index 6d20b19777..661de0acce 100644 --- a/modules/gdscript/gd_function.h +++ b/modules/gdscript/gd_function.h @@ -210,8 +210,9 @@ public: #ifdef TOOLS_ENABLED ERR_FAIL_INDEX_V(p_idx, arg_names.size(), StringName()); return arg_names[p_idx]; -#endif +#else return StringName(); +#endif } Variant get_default_argument(int p_idx) const { ERR_FAIL_INDEX_V(p_idx, default_arguments.size(), Variant()); diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 2d06c0f5d2..23201dc1b0 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -559,8 +559,9 @@ bool GDScript::_update_exports() { return changed; -#endif +#else return false; +#endif } void GDScript::update_exports() { diff --git a/modules/visual_script/visual_script_expression.cpp b/modules/visual_script/visual_script_expression.cpp index 78b70934c0..25c2ebd6d2 100644 --- a/modules/visual_script/visual_script_expression.cpp +++ b/modules/visual_script/visual_script_expression.cpp @@ -585,7 +585,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) { r_token.type = TK_BASIC_TYPE; r_token.value = i; return OK; - break; } } |