From 51f9672a40dd651ad0fb6df925a20b79667f828c Mon Sep 17 00:00:00 2001
From: Johann Schopplich <johann@schopplich.com>
Date: Fri, 26 Jun 2026 22:52:50 +0200
Subject: [PATCH] Emscripten: Clean up var usage and dead code in the JS glue

---
 resources/emscripten/emscripten-post.js | 14 ++++----------
 resources/emscripten/emscripten-pre.js  |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/resources/emscripten/emscripten-post.js b/resources/emscripten/emscripten-post.js
index 9d3e8f8c17..3790e1cbe1 100644
--- a/resources/emscripten/emscripten-post.js
+++ b/resources/emscripten/emscripten-post.js
@@ -30,7 +30,7 @@ Module.initApi = function() {
   Module.api_private.uploadSavegame_js = function (slot) {
     Module.api_private.createInputElement_js('easyrpg_saveFile', function (file) {
       const result = new Uint8Array(file.currentTarget.result);
-      var buf = Module._malloc(result.length);
+      const buf = Module._malloc(result.length);
       Module.HEAPU8.set(result, buf);
       Module.api_private.uploadSavegameStep2(slot, buf, result.length);
       Module._free(buf);
@@ -41,12 +41,9 @@ Module.initApi = function() {
   Module.api_private.uploadSoundfont_js = function () {
     Module.api_private.createInputElement_js('easyrpg_sfFile', function (file, name) {
       const result = new Uint8Array(file.currentTarget.result);
-      //const name_buf = Module._malloc(name.length + 1);
-      //stringToUTF8(name, name_buf, name.length + 1);
       const content_buf = Module._malloc(result.length);
       Module.HEAPU8.set(result, content_buf);
       Module.api_private.uploadSoundfontStep2(name, content_buf, result.length);
-      //Module._free(name_buf);
       Module._free(content_buf);
       Module.api.refreshScene();
     });
@@ -55,12 +52,9 @@ Module.initApi = function() {
   Module.api_private.uploadFont_js = function () {
     Module.api_private.createInputElement_js('easyrpg_sfFile', function (file, name) {
       const result = new Uint8Array(file.currentTarget.result);
-      //const name_buf = Module._malloc(name.length + 1);
-      //stringToUTF8(name, name_buf, name.length + 1);
       const content_buf = Module._malloc(result.length);
       Module.HEAPU8.set(result, content_buf);
       Module.api_private.uploadFontStep2(name, content_buf, result.length);
-      //Module._free(name_buf);
       Module._free(content_buf);
       Module.api.refreshScene();
     });
@@ -70,12 +64,12 @@ Module.initApi = function() {
 // Display the nice end message forever
 Module["onExit"] = function() {
   // load image
-  let imageContent = FS.readFile("/tmp/message.png");
-  var img = document.createElement('img');
+  const imageContent = FS.readFile("/tmp/message.png");
+  const img = document.createElement('img');
   img.id = "canvas";
   img.src = URL.createObjectURL(new Blob([imageContent], {type: "image/png"}));
 
   // replace canvas
-  var cvs = document.getElementById('canvas');
+  const cvs = document.getElementById('canvas');
   cvs.parentNode.replaceChild(img, cvs);
 }
diff --git a/resources/emscripten/emscripten-pre.js b/resources/emscripten/emscripten-pre.js
index 1741818d67..5ca7ad64a6 100644
--- a/resources/emscripten/emscripten-pre.js
+++ b/resources/emscripten/emscripten-pre.js
@@ -50,7 +50,7 @@ Module = { ...Module,
  * Parses the current location query to setup a specific game
  */
 function parseArgs () {
-  const items = window.location.search.substr(1).split("&");
+  const items = window.location.search.slice(1).split("&");
   let result = [];
 
   // Store saves in subdirectory `Save`