Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 07:18:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

InstructionPointer.prototype.source_location now returns the source location for instructions whose mnemonic doesn't exist in the source code but have arguments that do.

Browse Source
This commit is contained in:
jtuu 2020-05-01 07:20:43 +03:00
parent 0f25781857
commit a31452e971
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/quest_editor/QuestRunner.ts
View File

@ -221,13 +221,7 @@ export class QuestRunner {
// Exists in source? // Exists in source?
if (ip && ip.source_location) { if (ip && ip.source_location) {
this._pause_location.val = ip.source_location.line_no; this._pause_location.val = ip.source_location.line_no;
} } else {
// No source location. Belongs to another instruction?
else if (ip && ip.instruction.asm && ip.instruction.asm.args.length > 0) {
this._pause_location.val = ip.instruction.asm.args[0].line_no;
}
// No source location can be inferred.
else {
this._pause_location.val = undefined; this._pause_location.val = undefined;
} }
} }

2
src/quest_editor/scripting/vm/InstructionPointer.ts
View File

@ -43,7 +43,7 @@ export class InstructionPointer {
} }
get source_location(): AsmToken | undefined { get source_location(): AsmToken | undefined {
return this.instruction.asm?.mnemonic; return this.instruction.asm?.mnemonic || this.instruction.asm?.args[0];
} }
/** /**

8
src/quest_editor/scripting/vm/VirtualMachine.ts
View File

@ -495,13 +495,7 @@ export class VirtualMachine {
// Exists in source? // Exists in source?
if (ip && ip.source_location) { if (ip && ip.source_location) {
this.ignore_pauses_until_after_line = ip.source_location.line_no; this.ignore_pauses_until_after_line = ip.source_location.line_no;
} } else {
// No source location. Belongs to another instruction?
else if (ip && ip.instruction.asm && ip.instruction.asm.args.length > 0) {
this.ignore_pauses_until_after_line = ip.instruction.asm.args[0].line_no;
}
// No source location can be inferred.
else {
this.ignore_pauses_until_after_line = undefined; this.ignore_pauses_until_after_line = undefined;
} }
} }