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

[VM] Allow last instruction to return an ExecutionResult other than Halted.

Browse Source 
The next call to execute will then be a no-op and return Halted.
This commit is contained in:
jtuu 2019-11-11 18:07:26 +02:00
parent 87cabac307
commit b8db5d46fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/quest_editor/scripting/vm/index.ts
View File

@ -236,6 +236,9 @@ export class VirtualMachine {
*/ */
execute(): ExecutionResult { execute(): ExecutionResult {
let srcloc: AsmToken | undefined; let srcloc: AsmToken | undefined;
if (this.thread.length === 0) return ExecutionResult.Halted;
try { try {
const exec = this.thread[this.thread_idx]; const exec = this.thread[this.thread_idx];
const inst = this.get_next_instruction_from_thread(exec); const inst = this.get_next_instruction_from_thread(exec);
@ -262,7 +265,6 @@ export class VirtualMachine {
inst: Instruction, inst: Instruction,
srcloc?: AsmToken, srcloc?: AsmToken,
): ExecutionResult { ): ExecutionResult {
if (this.thread.length === 0) return ExecutionResult.Halted;
if (this.thread_idx >= this.thread.length) return ExecutionResult.WaitingVsync; if (this.thread_idx >= this.thread.length) return ExecutionResult.WaitingVsync;
let result = ExecutionResult.Ok; let result = ExecutionResult.Ok;
@ -694,8 +696,6 @@ export class VirtualMachine {
} }
} }
if (this.thread.length === 0) return ExecutionResult.Halted;
if (this.thread_idx >= this.thread.length) return ExecutionResult.WaitingVsync;
return result; return result;
} }