Fixed a bug causing GS levels to get ignored.

ltgcgo · Sep 2, 2024 · 216ac6c · 216ac6c
1 parent c7cb1b7
commit 216ac6c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/basic/index.mjs b/src/basic/index.mjs
@@ -212,6 +212,12 @@ let RootDisplay = class extends CustomEventSource {
 	getChVoice(ch) {
 		return this.device.getChVoice(ch);
 	};
+	getChPrimitive(ch, component, useSubDb) {
+		return this.device.getChPrimitive(ch, component, useSubDb);
+	};
+	getChPrimitives(ch, useSubDb) {
+		return this.device.getChPrimitives(ch, useSubDb);
+	};
 	getMapped(id) {
 		return this.#mapList[id]?.name || id;
 	};

diff --git a/src/disp/disp_sc8850.mjs b/src/disp/disp_sc8850.mjs
@@ -503,7 +503,7 @@ let Sc8850Display = class extends RootDisplay {
 			switch (upThis.device.getChMode(upThis.#ch)) {
 				case "gs":
 				case "sc": {
-					let cc32 = sum.chContr[chOff + ccToPos[32]];
+					let cc32 = upThis.getChPrimitive(upThis.#ch, 2, true);
 					if (cc32 > 0 && cc32 < 5) {
 						let cx = 153;
 						let cy = 48 - cc32 * 5;

diff --git a/src/state/index.mjs b/src/state/index.mjs
@@ -1461,6 +1461,9 @@ let OctaviaDevice = class extends CustomEventSource {
 	getSubDb() {
 		return self?.structuredClone(this.#subDb);
 	};
+	getDetect() {
+		return self?.structuredClone(this.#detect);
+	};
 	getVoice(msbO, prgO, lsbO, mode = "?") {
 		let upThis = this;
 		if (!modeMap[mode]?.constructor) {