From 4067ec2585335775d6a892b315c9914c2c81a818 Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Fri, 10 Jan 2025 21:03:02 +0100 Subject: [PATCH] . --- package-lock.json | 12 ++++++------ src/components/game/map/MapTiles.vue | 9 ++++----- src/composables/characterComposable.ts | 0 src/composables/gameComposable.ts | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 src/composables/characterComposable.ts diff --git a/package-lock.json b/package-lock.json index 6027364..ef5b53c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3085,9 +3085,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.79", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.79.tgz", - "integrity": "sha512-nYOxJNxQ9Om4EC88BE4pPoNI8xwSFf8pU/BAeOl4Hh/b/i6V4biTAzwV7pXi3ARKeoYO5JZKMIXTryXSVer5RA==", + "version": "1.5.80", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.80.tgz", + "integrity": "sha512-LTrKpW0AqIuHwmlVNV+cjFYTnXtM9K37OGhpe0ZI10ScPSxqVSryZHIY3WnCS5NSYbBODRTZyhRMS2h5FAEqAw==", "dev": true, "license": "ISC" }, @@ -4916,9 +4916,9 @@ "license": "BlueOak-1.0.0" }, "node_modules/papaparse": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.5.0.tgz", - "integrity": "sha512-rlVJyYL5QMvue8f/RNGpchWAiTc42GzJD/dqD/YgxJxmQ7TWQh5/7aN3p/aqxkYTRl/BkODi6Qsau1r2bt42JQ==", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.5.1.tgz", + "integrity": "sha512-EuEKUhyxrHVozD7g3/ztsJn6qaKse8RPfR6buNB2dMJvdtXNhcw8jccVi/LxNEY3HVrV6GO6Z4OoeCG9Iy9wpA==", "dev": true, "license": "MIT" }, diff --git a/src/components/game/map/MapTiles.vue b/src/components/game/map/MapTiles.vue index ea9f7e0..a864adf 100644 --- a/src/components/game/map/MapTiles.vue +++ b/src/components/game/map/MapTiles.vue @@ -74,10 +74,9 @@ onMounted(() => { }) onBeforeUnmount(() => { - if (tileMap) { - tileMap.destroyLayer('tiles') - tileMap.removeAllLayers() - tileMap.destroy() - } + if (!tileMap) return + tileMap.destroyLayer('tiles') + tileMap.removeAllLayers() + tileMap.destroy() }) diff --git a/src/composables/characterComposable.ts b/src/composables/characterComposable.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/composables/gameComposable.ts b/src/composables/gameComposable.ts index c17ddfc..f00f2cc 100644 --- a/src/composables/gameComposable.ts +++ b/src/composables/gameComposable.ts @@ -11,7 +11,7 @@ export async function loadTexture(scene: Phaser.Scene, textureData: TextureData) // Check if the texture is already loaded in Phaser if (gameStore.game.loadedTextures.find((texture) => texture === textureData.key)) { - return Promise.resolve(true) + return true } // If there's already a loading promise for this texture, return it @@ -49,7 +49,7 @@ export async function loadTexture(scene: Phaser.Scene, textureData: TextureData) } textureLoadingPromises.delete(textureData.key) // Clean up the promise - return Promise.resolve(false) + return false })() // Store the loading promise