diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-01 08:35:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 08:35:10 +0200 |
| commit | 4cce6f34170d693be994d9a451b4b5f96a084cfb (patch) | |
| tree | 74fa8c76ccd7eb2f289f08bb38a095c4cc74cb59 /modules | |
| parent | 613a8bee415381a8564d34092b479e1f159e8e60 (diff) | |
| parent | e6deba8d196a206ff350bc4d9fff783f78395d33 (diff) | |
Merge pull request #18321 from Crazy-P/Fixes-logically-dead-code
Fixes logically dead code (Coverity)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | modules/visual_script/visual_script_expression.cpp | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index f523eef895..4b96824dca 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -1154,9 +1154,9 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { for (int k = 0; k < 3; k++) { if (i < 3) - face_points[j][(i + k) % 3] = v[k] * (i >= 3 ? -1 : 1); + face_points[j][(i + k) % 3] = v[k]; else - face_points[3 - j][(i + k) % 3] = v[k] * (i >= 3 ? -1 : 1); + face_points[3 - j][(i + k) % 3] = -v[k]; } } diff --git a/modules/visual_script/visual_script_expression.cpp b/modules/visual_script/visual_script_expression.cpp index 55e2cc5fb5..d5f9d21348 100644 --- a/modules/visual_script/visual_script_expression.cpp +++ b/modules/visual_script/visual_script_expression.cpp @@ -455,7 +455,7 @@ Error VisualScriptExpression::_get_token(Token &r_token) { break; } - if (cchar == '-' || (cchar >= '0' && cchar <= '9')) { + if (cchar >= '0' && cchar <= '9') { //a number String num; @@ -466,11 +466,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) { #define READING_DONE 4 int reading = READING_INT; - if (cchar == '-') { - num += '-'; - cchar = GET_CHAR(); - } - CharType c = cchar; bool exp_sign = false; bool exp_beg = false; |