godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #29941 from qarmin/redundant_code_and_others

Browse Source 
Remove redundant code, possible NULL pointers and others
This commit is contained in:
Rémi Verschelde
2019-06-27 01:05:18 +02:00
committed by GitHub
parent d8c9646118 4e5310cc60
commit eaaff9da31
175 changed files with 467 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/main.cpp
View File

@@ -812,7 +812,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
int sp = bp.find_last(":");
if (sp == -1) {
ERR_EXPLAIN("Invalid breakpoint: '" + bp + "', expected file:line format.");
ERR_CONTINUE(sp == -1);
ERR_CONTINUE(true);
}
script_debugger->insert_breakpoint(bp.substr(sp + 1, bp.length()).to_int(), bp.substr(0, sp));
@@ -1469,7 +1469,7 @@ bool Main::start() {
if (obj)
memdelete(obj);
ERR_EXPLAIN("Can't load script '" + script + "', it does not inherit from a MainLoop type");
ERR_FAIL_COND_V(!script_loop, false);
ERR_FAIL_V(false);
}
script_loop->set_init_script(script_res);