From 683ab6a2c930b99aef5ce380047bd7c04b3f3ebf Mon Sep 17 00:00:00 2001
From: "Eevee (Evelyn Woods)" <eevee.git@veekun.com>
Date: Sun, 3 Jan 2021 18:43:24 -0700
Subject: [PATCH] Fix some fallout from all that editor rendering stuff

---
 js/main-editor.js     |  2 +-
 js/renderer-canvas.js | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/js/main-editor.js b/js/main-editor.js
index 50c7c0c..ad64be2 100644
--- a/js/main-editor.js
+++ b/js/main-editor.js
@@ -2755,7 +2755,7 @@ export class Editor extends PrimaryView {
         for (let i = 0; i < size_x * size_y; i++) {
             stored_level.linear_cells.push(this._make_cell(...stored_level.scalar_to_coords(i)));
         }
-        stored_level.linear_cells[LAYERS.actor] = {type: TILE_TYPES['player'], direction: 'south'};
+        stored_level.linear_cells[0][LAYERS.actor] = {type: TILE_TYPES['player'], direction: 'south'};
         return stored_level;
     }
 
diff --git a/js/renderer-canvas.js b/js/renderer-canvas.js
index f148ed4..e7f36c5 100644
--- a/js/renderer-canvas.js
+++ b/js/renderer-canvas.js
@@ -82,19 +82,24 @@ export class CanvasRenderer {
             this.blit(ctx, tx + mx, ty + my, offsetx + mdx, offsety + mdy, mw, mh);
     }
 
+    _adjust_viewport_if_dirty() {
+        if (! this.viewport_dirty)
+            return;
+
+        this.viewport_dirty = false;
+        this.canvas.setAttribute('width', this.tileset.size_x * this.viewport_size_x);
+        this.canvas.setAttribute('height', this.tileset.size_y * this.viewport_size_y);
+        this.canvas.style.setProperty('--viewport-width', this.viewport_size_x);
+        this.canvas.style.setProperty('--viewport-height', this.viewport_size_y);
+    }
+
     draw(tic_offset = 0) {
         if (! this.level) {
             console.warn("CanvasRenderer.draw: No level to render");
             return;
         }
 
-        if (this.viewport_dirty) {
-            this.viewport_dirty = false;
-            this.canvas.setAttribute('width', this.tileset.size_x * this.viewport_size_x);
-            this.canvas.setAttribute('height', this.tileset.size_y * this.viewport_size_y);
-            this.canvas.style.setProperty('--viewport-width', this.viewport_size_x);
-            this.canvas.style.setProperty('--viewport-height', this.viewport_size_y);
-        }
+        this._adjust_viewport_if_dirty();
 
         let tic = (this.level.tic_counter ?? 0) + tic_offset;
         let tw = this.tileset.size_x;
@@ -237,6 +242,8 @@ export class CanvasRenderer {
     // Used by the editor and map previews.  Draws a region of the level (probably a StoredLevel),
     // assuming nothing is moving.
     draw_static_region(x0, y0, x1, y1, destx = x0, desty = y0) {
+        this._adjust_viewport_if_dirty();
+
         for (let x = x0; x <= x1; x++) {
             for (let y = y0; y <= y1; y++) {
                 let cell = this.level.cell(x, y);