From ea0885663697046674cdd98dd4c913802726c96e Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 12 Feb 2025 11:48:25 -0800 Subject: [PATCH] fix merge conflict: put / in flag path --- src/client/graphics/layers/NameLayer.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/client/graphics/layers/NameLayer.ts b/src/client/graphics/layers/NameLayer.ts index e7765b0fc..79e3acd76 100644 --- a/src/client/graphics/layers/NameLayer.ts +++ b/src/client/graphics/layers/NameLayer.ts @@ -149,18 +149,6 @@ export class NameLayer implements Layer { element.style.alignItems = "center"; element.style.gap = "0px"; - if (player.flag()) { - const flagImg = document.createElement("img"); - flagImg.classList.add("player-flag"); - flagImg.style.marginBottom = "-5%"; - flagImg.style.opacity = "0.8"; - flagImg.src = "flags/" + sanitize(player.flag()) + ".svg"; - flagImg.style.zIndex = "1"; - flagImg.style.width = "40%"; - flagImg.style.aspectRatio = "3/4"; - element.appendChild(flagImg); - } - const textColor = player.type() == PlayerType.Human ? "#000000" : "#4D4D4D"; const nameDiv = document.createElement("div"); @@ -180,7 +168,7 @@ export class NameLayer implements Layer { flagImg.style.marginBottom = "-10%"; flagImg.style.marginTop = "-20%"; flagImg.style.opacity = "0.8"; - flagImg.src = "flags/" + sanitize(player.flag()) + ".svg"; + flagImg.src = "/flags/" + sanitize(player.flag()) + ".svg"; flagImg.style.zIndex = "1"; flagImg.style.width = "30%"; flagImg.style.aspectRatio = "3/4";