From d68e8c2b728484cd5647979ed8f54985dae22a91 Mon Sep 17 00:00:00 2001
From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com>
Date: Tue, 20 Oct 2026 10:18:10 +0200
Subject: [PATCH] fix: put the UQM addon packs in content/addons

A .uqm in content/packages is mounted at the root, one in content/addons at addons, and loadAddon opens addons/3domusic, addons/3dovoice and addons/remix (options.c:393-402, 518-551, setup.c:118-132). The six music, voice and remix packs were placed where they would not load. The installer writes them to content\addons too.
---
 emulators/uqm.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/emulators/uqm.yml b/emulators/uqm.yml
index 648350a8..bbbf4f84 100644
--- a/emulators/uqm.yml
+++ b/emulators/uqm.yml
@@ -34,7 +34,11 @@ notes: |
 
   3DO music (uqm-0.8.0-3domusic.uqm) and voice overs
   (uqm-0.8.0-voice.uqm) are optional sections (installer lines 315,
-  329 - SectionIn 1 4 6). The four remix packs (uqm-remix-disc1.uqm
+  329, SectionIn 1 4 6). They go in content/addons/, not packages/:
+  a .uqm there is mounted at "addons" (src/options.c:393-402) and
+  loadAddon opens addons/3domusic, addons/3dovoice and addons/remix
+  (options.c:518-551, uqm/setup.c:118-132). Placed in packages/ their
+  files would sit at the root and the addon would not load. The four remix packs (uqm-remix-disc1.uqm
   through uqm-remix-disc4-1.uqm) are only in SectionIn 6 ("Full").
 
   content/base, content/addons and the two .key sentinel files
@@ -59,61 +63,61 @@ files:
     source_ref: "build/win32_install/packages.nsh:3-5; sc2/build/win32_install/uqm-installer.nsi:289-306"
 
   - name: uqm-0.8.0-3domusic.uqm
-    path: uqm/content/packages/uqm-0.8.0-3domusic.uqm
+    path: uqm/content/addons/uqm-0.8.0-3domusic.uqm
     system: ur-quan-masters
     category: game_data
     required: false
     md5: "9e5801d45ca12028b486cdeb83568c02"
     validation: [md5]
     description: "UQM 3DO music track pack"
-    source_ref: "build/win32_install/packages.nsh:6-8; sc2/build/win32_install/uqm-installer.nsi:315-327"
+    source_ref: "build/win32_install/packages.nsh:6-8; sc2/build/win32_install/uqm-installer.nsi:315-327, sc2/src/options.c:393-402, 518-551, sc2/src/uqm/setup.c:118-132"
 
   - name: uqm-0.8.0-voice.uqm
-    path: uqm/content/packages/uqm-0.8.0-voice.uqm
+    path: uqm/content/addons/uqm-0.8.0-voice.uqm
     system: ur-quan-masters
     category: game_data
     required: false
     md5: "fc89f77d7b66c2669abca6c157f5259a"
     validation: [md5]
     description: "UQM alien-race voice-over pack"
-    source_ref: "build/win32_install/packages.nsh:9-11; sc2/build/win32_install/uqm-installer.nsi:329-341"
+    source_ref: "build/win32_install/packages.nsh:9-11; sc2/build/win32_install/uqm-installer.nsi:329-341, sc2/src/options.c:393-402, 518-551, sc2/src/uqm/setup.c:118-132"
 
   - name: uqm-remix-disc1.uqm
-    path: uqm/content/packages/uqm-remix-disc1.uqm
+    path: uqm/content/addons/uqm-remix-disc1.uqm
     system: ur-quan-masters
     category: game_data
     required: false
     md5: "09f242d8d72166d1d5ccbd3d99c93e7d"
     validation: [md5]
     description: "Precursor Remix disc 1 (modern remixes)"
-    source_ref: "build/win32_install/packages.nsh:12-14; sc2/build/win32_install/uqm-installer.nsi:345-358"
+    source_ref: "build/win32_install/packages.nsh:12-14; sc2/build/win32_install/uqm-installer.nsi:345-358, sc2/src/options.c:393-402, 518-551, sc2/src/uqm/setup.c:118-132"
 
   - name: uqm-remix-disc2.uqm
-    path: uqm/content/packages/uqm-remix-disc2.uqm
+    path: uqm/content/addons/uqm-remix-disc2.uqm
     system: ur-quan-masters
     category: game_data
     required: false
     md5: "fbc8bdcb709939d559d8c7216ad15cc2"
     validation: [md5]
     description: "Precursor Remix disc 2"
-    source_ref: "build/win32_install/packages.nsh:15-17"
+    source_ref: "build/win32_install/packages.nsh:15-17, sc2/src/options.c:393-402, 518-551, sc2/src/uqm/setup.c:118-132"
 
   - name: uqm-remix-disc3.uqm
-    path: uqm/content/packages/uqm-remix-disc3.uqm
+    path: uqm/content/addons/uqm-remix-disc3.uqm
     system: ur-quan-masters
     category: game_data
     required: false
     md5: "5ccc6d4ac301ae98e172ac6835dcdead"
     validation: [md5]
     description: "Precursor Remix disc 3"
-    source_ref: "build/win32_install/packages.nsh:18-20"
+    source_ref: "build/win32_install/packages.nsh:18-20, sc2/src/options.c:393-402, 518-551, sc2/src/uqm/setup.c:118-132"
 
   - name: uqm-remix-disc4-1.uqm
-    path: uqm/content/packages/uqm-remix-disc4-1.uqm
+    path: uqm/content/addons/uqm-remix-disc4-1.uqm
     system: ur-quan-masters
     category: game_data
     required: false
     md5: "3fb63f4ac514343ed4b4b5b194c413fb"
     validation: [md5]
     description: "Precursor Remix disc 4-1"
-    source_ref: "build/win32_install/packages.nsh:21-23"
+    source_ref: "build/win32_install/packages.nsh:21-23, sc2/src/options.c:393-402, 518-551, sc2/src/uqm/setup.c:118-132"