diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-22 00:58:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 00:58:12 +0200 |
| commit | df590fc2d33c1ba715a4ce58f71d83e0ed9f5693 (patch) | |
| tree | 8bfdc3e033aaf4dc9a5de5e8040e4f99afa0c540 /main | |
| parent | 13f879587dd9bce59528e44b0faaf6e062f6d918 (diff) | |
| parent | 738d2ab96997faa1e13b91e38cf8a0000d829f70 (diff) | |
| download | redot-engine-df590fc2d33c1ba715a4ce58f71d83e0ed9f5693.tar.gz | |
Merge pull request #10340 from Rubonnek/remove-unnecessary-assignments
Removed unnecessary assignments
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 5 | ||||
| -rw-r--r-- | main/tests/test_string.cpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/main.cpp b/main/main.cpp index e49c66dddf..0c6de4325c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -904,9 +904,10 @@ Error Main::setup2() { MAIN_PRINT("Main: Setup Logo"); - bool show_logo = true; #ifdef JAVASCRIPT_ENABLED - show_logo = false; + bool show_logo = false; +#else + bool show_logo = true; #endif if (init_screen != -1) { diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp index 5531b71c96..0ff84a8286 100644 --- a/main/tests/test_string.cpp +++ b/main/tests/test_string.cpp @@ -802,7 +802,6 @@ bool test_28() { bool test_29() { bool state = true; - bool success = false; IP_Address ip0("2001:0db8:85a3:0000:0000:8a2e:0370:7334"); OS::get_singleton()->print("ip0 is %ls\n", String(ip0).c_str()); @@ -817,7 +816,7 @@ bool test_29() { OS::get_singleton()->print("ip6 is %ls\n", String(ip3).c_str()); String ip4 = "192.168.0.1"; - success = ip4.is_valid_ip_address(); + bool success = ip4.is_valid_ip_address(); OS::get_singleton()->print("Is valid ipv4: %ls, %s\n", ip4.c_str(), success ? "OK" : "FAIL"); if (!success) state = false; |