From f97e50612fe32b8598c655f0a720902418d36081 Mon Sep 17 00:00:00 2001
From: Wirlaburla <wirlaburla@worlio.com>
Date: Tue, 27 Feb 2024 22:24:07 -0600
Subject: [PATCH] Fix issue with adding octave over line and disable dynamic
 roll not disabling the octave line

---
 src/main.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2f9e5a9..c1fed61 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -624,10 +624,10 @@ void displayNoteRoll(xmp_module_info *mi, xmp_frame_info *fi) {
 	if (dynamicRoll) {
 		for (int l = 1; l <= 8; l++) {
 			int cnote = (l*12);
-			if (cnote < prMin && l == (prMin / 12)) {
+			if (cnote <= prMin && l == (prMin / 12)) {
 				wmove(dis, 0, 0);
 				wprintw(dis, "<%i", l);
-			} else if (cnote <= prMax && cnote >= prMin) {
+			} else if (cnote < prMax && cnote > prMin) {
 				wmove(dis, 0, (((cnote - prMin) * (COLS - 5)) / (prMax - prMin))+3);
 				wprintw(dis, "%i", l);
 			}
@@ -635,8 +635,8 @@ void displayNoteRoll(xmp_module_info *mi, xmp_frame_info *fi) {
 	}
 	for (int y = vOffset; y < ins; y++) {
 		if (!dynamicRoll) { prMin = 0; prMax = 144; }
-		if (y > (LINES - 6)+vOffset || y < 0) continue;
-		wmove(dis, (y-vOffset)+1, 0);
+		if (y > (LINES - (5+dynamicRoll))+vOffset || y < 0) continue;
+		wmove(dis, (y-vOffset)+dynamicRoll, 0);
 		wattron(dis, no_pair);
 		wprintw(dis, "%02X", y+1);
 		wattroff(dis, no_pair);
@@ -654,12 +654,12 @@ void displayNoteRoll(xmp_module_info *mi, xmp_frame_info *fi) {
 			int note = ((cinfo.note - prMin) * (COLS - 5)) / (dynamicRoll?(prMax - prMin):96);
 			if (cinfo.instrument != y) continue;
 			
-			wmove(dis, (y-vOffset)+1, note+3);
+			wmove(dis, (y-vOffset)+dynamicRoll, note+3);
 			if (cinfo.volume >= 32) 
 				waddstr(dis, "#");
-			else if (cinfo.volume >= 16 && (char)mvwinch(dis, (y-vOffset)+1, note+3) != '#') 
+			else if (cinfo.volume >= 16 && (char)mvwinch(dis, (y-vOffset)+dynamicRoll, note+3) != '#') 
 				waddstr(dis, "=");
-			else if (cinfo.volume > 0 && ((char)mvwinch(dis, (y-vOffset)+1, note+3) != '-' || (char)mvwinch(dis, (y-vOffset)+1, note+3) != '#')) 
+			else if (cinfo.volume > 0 && ((char)mvwinch(dis, (y-vOffset)+dynamicRoll, note+3) != '-' || (char)mvwinch(dis, (y-vOffset)+dynamicRoll, note+3) != '#')) 
 				waddstr(dis, "-");
 		}
 		wmove(dis, y, COLS-4);