Merge pull request #38067 from ThakeeNathees/elif-error-line-fixed

GDScript debugger incorrect error line fixed

Merge pull request #38067 from ThakeeNathees/elif-error-line-fixed
d341181f · Rémi Verschelde · GitHub · 84e7552f · 9325671f · d341181f
Unverified Commit d341181f authored Jun 17, 2020 by Rémi Verschelde Committed by GitHub Jun 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

gdscript_compiler.cpp modules/gdscript/gdscript_compiler.cpp +4 -0

No files found.
--- a/modules/gdscript/gdscript_compiler.cpp
+++ b/modules/gdscript/gdscript_compiler.cpp
@@ -1422,6 +1422,10 @@ Error GDScriptCompiler::_parse_block(CodeGen &codegen, const GDScriptParser::Blo
 							codegen.opcodes.push_back(0);
 							codegen.opcodes.write[else_addr] = codegen.opcodes.size();

+							codegen.opcodes.push_back(GDScriptFunction::OPCODE_LINE);
+							codegen.opcodes.push_back(cf->body_else->line);
+							codegen.current_line = cf->body_else->line;
+
 							Error err2 = _parse_block(codegen, cf->body_else, p_stack_level, p_break_addr, p_continue_addr);
 							if (err2) {
 								return err2;