From 5d5cb58412bd663aed4897ef7b0f0bd7f263d096 Mon Sep 17 00:00:00 2001
From: Caleb <caleb.mabry.15@cnu.edu>
Date: Tue, 30 Aug 2022 17:28:30 -0400
Subject: Add more

---
 webAO/packets/handlers/handleEM.ts | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 webAO/packets/handlers/handleEM.ts

(limited to 'webAO/packets/handlers/handleEM.ts')

diff --git a/webAO/packets/handlers/handleEM.ts b/webAO/packets/handlers/handleEM.ts
new file mode 100644
index 0000000..973d2af
--- /dev/null
+++ b/webAO/packets/handlers/handleEM.ts
@@ -0,0 +1,39 @@
+import { client } from '../../client'
+import { safeTags } from '../../encoding';
+
+/**
+ * Handles incoming music information, containing multiple entries
+ * per packet.
+ * @param {Array} args packet arguments
+ */
+export const handleEM = (args: string[]) => {
+    document.getElementById("client_loadingtext")!.innerHTML = "Loading Music";
+    if (args[1] === "0") {
+        client.resetMusicList();
+        client.resetAreaList();
+        client.musics_time = false;
+    }
+
+    for (let i = 2; i < args.length - 1; i++) {
+        if (i % 2 === 0) {
+            const trackname = safeTags(args[i]);
+            const trackindex = Number(args[i - 1]);
+            (<HTMLProgressElement>(
+                document.getElementById("client_loadingbar")
+            )).value =
+                client.char_list_length + client.evidence_list_length + trackindex;
+            if (client.musics_time) {
+                client.addTrack(trackname);
+            } else if (client.isAudio(trackname)) {
+                client.musics_time = true;
+                client.fix_last_area();
+                client.addTrack(trackname);
+            } else {
+                client.createArea(trackindex, trackname);
+            }
+        }
+    }
+
+    // get the next batch of tracks
+    client.sendServer(`AM#${Number(args[1]) / 10 + 1}#%`);
+}
\ No newline at end of file
-- 
cgit 


From 9b8f8c3f5310b6af15edf8ff933e2d63e05707a7 Mon Sep 17 00:00:00 2001
From: Caleb <caleb.mabry.15@cnu.edu>
Date: Thu, 8 Sep 2022 12:13:14 -0400
Subject: Add Sender support

---
 webAO/packets/handlers/handleEM.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webAO/packets/handlers/handleEM.ts')

diff --git a/webAO/packets/handlers/handleEM.ts b/webAO/packets/handlers/handleEM.ts
index 973d2af..9f3cb87 100644
--- a/webAO/packets/handlers/handleEM.ts
+++ b/webAO/packets/handlers/handleEM.ts
@@ -35,5 +35,5 @@ export const handleEM = (args: string[]) => {
     }
 
     // get the next batch of tracks
-    client.sendServer(`AM#${Number(args[1]) / 10 + 1}#%`);
+    client.sender.sendServer(`AM#${Number(args[1]) / 10 + 1}#%`);
 }
\ No newline at end of file
-- 
cgit 


From 93979636fb5d1c60f0da3290e80eb3ca9ead992f Mon Sep 17 00:00:00 2001
From: Caleb <caleb.mabry.15@cnu.edu>
Date: Fri, 9 Sep 2022 18:46:42 -0400
Subject: Migrated functions

---
 webAO/packets/handlers/handleEM.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'webAO/packets/handlers/handleEM.ts')

diff --git a/webAO/packets/handlers/handleEM.ts b/webAO/packets/handlers/handleEM.ts
index 9f3cb87..5e49ea4 100644
--- a/webAO/packets/handlers/handleEM.ts
+++ b/webAO/packets/handlers/handleEM.ts
@@ -1,4 +1,8 @@
 import { client } from '../../client'
+import { addTrack } from '../../client/addTrack';
+import { createArea } from '../../client/createArea';
+import { fix_last_area } from '../../client/fixLastArea';
+import { isAudio } from '../../client/isAudio';
 import { safeTags } from '../../encoding';
 
 /**
@@ -23,13 +27,13 @@ export const handleEM = (args: string[]) => {
             )).value =
                 client.char_list_length + client.evidence_list_length + trackindex;
             if (client.musics_time) {
-                client.addTrack(trackname);
-            } else if (client.isAudio(trackname)) {
+                addTrack(trackname);
+            } else if (isAudio(trackname)) {
                 client.musics_time = true;
-                client.fix_last_area();
-                client.addTrack(trackname);
+                fix_last_area();
+                addTrack(trackname);
             } else {
-                client.createArea(trackindex, trackname);
+                createArea(trackindex, trackname);
             }
         }
     }
-- 
cgit