diff options
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index c765ff9700..77c4e5a385 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -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)); @@ -1375,6 +1375,8 @@ bool Main::start() { #ifdef TOOLS_ENABLED if (doc_tool != "") { + Engine::get_singleton()->set_editor_hint(true); // Needed to instance editor-only classes for their default values + { DirAccessRef da = DirAccess::open(doc_tool); if (!da) { @@ -1469,7 +1471,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); |