From 569a3c0f3d68589abd91179d23915efd014ef8bc Mon Sep 17 00:00:00 2001
From: "Eevee (Evelyn Woods)" <eevee.git@veekun.com>
Date: Thu, 17 Sep 2020 00:02:01 -0600
Subject: [PATCH] Fix wired drawing of teleports

---
 js/tileset.js   | 10 ++++++++--
 js/tiletypes.js |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/js/tileset.js b/js/tileset.js
index 7a2c2ec..e0dc0e7 100644
--- a/js/tileset.js
+++ b/js/tileset.js
@@ -189,7 +189,10 @@ export const CC2_TILESET_LAYOUT = {
         overlay: 'thinwall_e',
     },
     // TODO directional block arrows
-    teleport_blue: [[4, 10], [5, 10], [6, 10], [7, 10]],
+    teleport_blue: {
+        base: [0, 2],
+        wired: [[4, 10], [5, 10], [6, 10], [7, 10]],
+    },
     popwall: [8, 10],
     gravel: [9, 10],
     ball: [[10, 10], [11, 10], [12, 10], [13, 10], [14, 10]],
@@ -261,7 +264,10 @@ export const CC2_TILESET_LAYOUT = {
     teleport_green: [[4, 19], [5, 19], [6, 19], [7, 19]],
     teleport_yellow: [[8, 19], [9, 19], [10, 19], [11, 19]],
     transmogrifier: [[12, 19], [13, 19], [14, 19], [15, 19]],
-    teleport_red: [[4, 20], [5, 20], [6, 20], [7, 20]],
+    teleport_red: {
+        base: [0, 2],
+        wired: [[4, 20], [5, 20], [6, 20], [7, 20]],
+    },
     slime: [[8, 20], [9, 20], [10, 20], [11, 20], [12, 20], [13, 20], [14, 20], [15, 20]],
 
     force_floor_all: [[0, 21], [1, 21], [2, 21], [3, 21], [4, 21], [5, 21], [6, 21], [7, 21]],
diff --git a/js/tiletypes.js b/js/tiletypes.js
index 372e319..1ab8b99 100644
--- a/js/tiletypes.js
+++ b/js/tiletypes.js
@@ -24,7 +24,7 @@ function player_visual_state(me) {
     else if (me.fail_reason) {
         return 'failed';
     }
-    else if (me.cell.some(t => t.type.name === 'water') &&
+    else if (me.cell && me.cell.some(t => t.type.name === 'water') &&
         (! me.previous_cell || me.previous_cell.some(t => t.type.name === 'water')))
     {
         return 'swimming';