mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-14 20:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Define waitOnLoad to occur before starting load in loadAssets

Browse Source
This commit is contained in:
Sirz Benjie 2025-04-17 10:08:45 -05:00
parent b2bab46e1c
commit 15f01970d3
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/field/pokemon.ts
View File

@ -838,14 +838,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} }
} }
console.log("Before awaiting line 842");
await Promise.allSettled(loadPromises); await Promise.allSettled(loadPromises);
console.log("After awaiting line 842");
// This must be initiated before we queue loading, otherwise the load could have finished before
// we reach the line of code that adds the listener, causing a deadlock.
const waitOnLoadPromise = new Promise<void>(resolve => globalScene.load.once(Phaser.Loader.Events.COMPLETE, resolve));
// Wait for the assets we queued to load to finish loading, then... // Wait for the assets we queued to load to finish loading, then...
if (!globalScene.load.isLoading()) { if (!globalScene.load.isLoading()) {
// push an event that will resolve when the load is complete
globalScene.load.start(); globalScene.load.start();
} }
// See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises#creating_a_promise_around_an_old_callback_api // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises#creating_a_promise_around_an_old_callback_api
await new Promise(resolve => globalScene.load.once(Phaser.Loader.Events.COMPLETE, resolve)); await waitOnLoadPromise;
// With the sprites loaded, generate the animation frame information // With the sprites loaded, generate the animation frame information
if (this.isPlayer()) { if (this.isPlayer()) {
@ -874,6 +882,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (this.summonData?.speciesForm) { if (this.summonData?.speciesForm) {
this.updateFusionPalette(true); this.updateFusionPalette(true);
} }
console.log("Line 881");
} }
/** /**