again

gamecanvas.js

@@ -5,18 +5,6 @@ const canvas = document.getElementById('canvas');
 const gameContainer = document.getElementById('gameContainer');
 let lastTouchedId;
 
-// Launch the Player and configure it
-window.addEventListener('load', (event) => {
-  createEasyRpgPlayer(easyrpgPlayer)
-  .then(function(Module) {
-    // Module is ready
-    easyrpgPlayer = Module;
-    easyrpgPlayer.initApi();
-
-    canvas.focus();
-  });
-});
-
 // Make EasyRPG player embeddable
 canvas.addEventListener('mouseenter', () => canvas.focus());
 canvas.addEventListener('click', () => canvas.focus());

init.js

@@ -38,8 +38,7 @@ let easyrpgPlayer = {
   initialized: false,
   game: ynoGameId,
   saveFs: undefined,
-  wsUrl: 'wss://connect.ynoproject.net/' + ynoGameId + '/',
-  postRun: []
+  wsUrl: 'wss://connect.ynoproject.net/' + ynoGameId + '/'
 };
 
 const sessionIdKey = 'ynoproject_sessionId';
@@ -79,8 +78,10 @@ async function injectScripts() {
         }
         if (globalConfig.preloads)
           initPreloads();
+
+        let easyrpgPlayerLoadFuncs = [];
 
-        easyrpgPlayer.postRun.push(() => {
+        easyrpgPlayerLoadFuncs.push(() => {
           easyrpgPlayer.initialized = true;
           easyrpgPlayer._SetNametagMode(config.nametagMode);
           easyrpgPlayer._SetSoundVolume(globalConfig.soundVolume);
@@ -100,7 +101,19 @@ async function injectScripts() {
           };
         });
         if (typeof onResize !== 'undefined')
-          easyrpgPlayer.postRun.push(onResize);
+          easyrpgPlayerLoadFuncs.push(onResize);
+
+        createEasyRpgPlayer(easyrpgPlayer)
+          .then(function(Module) {
+            // Module is ready
+            easyrpgPlayer = Module;
+            easyrpgPlayer.initApi();
+
+            for (let func of easyrpgPlayerLoadFuncs)
+              func();
+
+            canvas.focus();
+          });
       };
 
     const scriptTag = document.createElement('script');