From 50eaf4308237f3dac3db144ad9e16b944c57918d Mon Sep 17 00:00:00 2001
From: Daan Vanden Bosch <daan.v.d.bosch@gmail.com>
Date: Wed, 24 Jul 2019 22:53:20 +0200
Subject: [PATCH] Script editor is now readonly if no quest is loaded. Fixed a
 bug in the assembly worker. Fixed wrong opcode.

---
 src/data_formats/parsing/quest/opcodes.ts     |  2 +-
 src/scripting/assembly_worker_init.ts         | 15 ++++++++-------
 src/ui/quest_editor/ScriptEditorComponent.tsx |  3 +++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/data_formats/parsing/quest/opcodes.ts b/src/data_formats/parsing/quest/opcodes.ts
index df925ee5..fcd6e64f 100644
--- a/src/data_formats/parsing/quest/opcodes.ts
+++ b/src/data_formats/parsing/quest/opcodes.ts
@@ -675,7 +675,7 @@ export class Opcode {
     static readonly p_noncol = (OPCODES[0x74] = new Opcode(0x74, "p_noncol", [], false, []));
     static readonly p_col = (OPCODES[0x75] = new Opcode(0x75, "p_col", [], false, []));
     static readonly p_setpos = (OPCODES[0x76] = new Opcode(0x76, "p_setpos", [], false, [
-        { type: Type.Register },
+        { type: Type.U32 },
         { type: Type.Register },
     ]));
     static readonly p_return_guild = (OPCODES[0x77] = new Opcode(
diff --git a/src/scripting/assembly_worker_init.ts b/src/scripting/assembly_worker_init.ts
index cf0183cb..af632285 100644
--- a/src/scripting/assembly_worker_init.ts
+++ b/src/scripting/assembly_worker_init.ts
@@ -46,19 +46,20 @@ function process_messages(): void {
                     // Keep the left part of the first changed line.
                     replace_line_part_right(startLineNumber, startColumn, new_lines[0]);
 
-                    // Replace all the lines in between.
-                    replace_lines(
-                        startLineNumber + 1,
-                        endLineNumber - 1,
-                        new_lines.slice(1, new_lines.length - 1)
-                    );
-
                     // Keep the right part of the last changed line.
                     replace_line_part_left(
                         endLineNumber,
                         endColumn,
                         new_lines[new_lines.length - 1]
                     );
+
+                    // Replace all the lines in between.
+                    // It's important that we do this last.
+                    replace_lines(
+                        startLineNumber + 1,
+                        endLineNumber - 1,
+                        new_lines.slice(1, new_lines.length - 1)
+                    );
                 }
             }
         }
diff --git a/src/ui/quest_editor/ScriptEditorComponent.tsx b/src/ui/quest_editor/ScriptEditorComponent.tsx
index 36e87551..be2dbe97 100644
--- a/src/ui/quest_editor/ScriptEditorComponent.tsx
+++ b/src/ui/quest_editor/ScriptEditorComponent.tsx
@@ -238,6 +238,9 @@ class MonacoComponent extends Component<MonacoProps> {
 
             this.disposers.push(() => disposable.dispose());
             this.editor.setModel(model);
+            this.editor.updateOptions({ readOnly: false });
+        } else if (this.editor) {
+            this.editor.updateOptions({ readOnly: true });
         }
     };