From 2288d06608f006bd6972ee7b323179f33ca6b589 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Thu, 29 Sep 2022 20:04:24 +0200
Subject: [PATCH] Small menu fixes.

---
 language.version                          |  4 ++--
 zscript/kbase/swwm_kbasetab_inventory.zsc | 12 +++++++-----
 zscript/kbase/swwm_kbasetab_keychain.zsc  | 10 ++++++----
 zscript/kbase/swwm_kbasetab_store.zsc     | 10 ++++++----
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/language.version b/language.version
index 7591e2bb5..69f0371af 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r529 \cu(Thu 29 Sep 19:51:36 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r529 \cu(2022-09-29 19:51:36)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r530 \cu(Thu 29 Sep 20:04:24 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r530 \cu(2022-09-29 20:04:24)\c-";
diff --git a/zscript/kbase/swwm_kbasetab_inventory.zsc b/zscript/kbase/swwm_kbasetab_inventory.zsc
index 0577dd7cd..24b2c038a 100644
--- a/zscript/kbase/swwm_kbasetab_inventory.zsc
+++ b/zscript/kbase/swwm_kbasetab_inventory.zsc
@@ -305,7 +305,7 @@ Class DemolitionistInventoryTab : DemolitionistMenuTab
 			invlist.items[i].xpos = xx;
 			invlist.items[i].ypos = yy;
 			yy += 16;
-			if ( yy >= (master.ws.y-48) )
+			if ( yy > (master.ws.y-62) )
 			{
 				xx += maxw+16;	// pad
 				yy = 0;
@@ -402,11 +402,13 @@ Class DemolitionistInventoryTab : DemolitionistMenuTab
 		{
 		case MB_LEFT:
 			// see if we're clicking the scrollbar (if it exists)
-			if ( pos.y > (master.ws.y-21) )
+			if ( (pos.y > (master.ws.y-21)) &&  )
 			{
-				SetOffset(pos.x);
-				master.MenuSound("menu/demoscroll");
-				drag = true;
+				if ( SetOffset(pos.x) )
+				{
+					master.MenuSound("menu/demoscroll");
+					drag = true;
+				}
 				break;
 			}
 			// find which element we clicked
diff --git a/zscript/kbase/swwm_kbasetab_keychain.zsc b/zscript/kbase/swwm_kbasetab_keychain.zsc
index a5ddf83e6..f57e2a530 100644
--- a/zscript/kbase/swwm_kbasetab_keychain.zsc
+++ b/zscript/kbase/swwm_kbasetab_keychain.zsc
@@ -165,7 +165,7 @@ Class DemolitionistKeychainTab : DemolitionistMenuTab
 			invlist.items[i].xpos = xx;
 			invlist.items[i].ypos = yy;
 			yy += 16;
-			if ( yy >= (master.ws.y-48) )
+			if ( yy > (master.ws.y-62) )
 			{
 				xx += maxw+16;	// pad
 				yy = 0;
@@ -260,9 +260,11 @@ Class DemolitionistKeychainTab : DemolitionistMenuTab
 			// see if we're clicking the scrollbar (if it exists)
 			if ( pos.y > (master.ws.y-21) )
 			{
-				SetOffset(pos.x);
-				master.MenuSound("menu/demoscroll");
-				drag = true;
+				if ( SetOffset(pos.x) )
+				{
+					master.MenuSound("menu/demoscroll");
+					drag = true;
+				}
 				break;
 			}
 			// find which element we clicked
diff --git a/zscript/kbase/swwm_kbasetab_store.zsc b/zscript/kbase/swwm_kbasetab_store.zsc
index e3d56308f..0da0644d3 100644
--- a/zscript/kbase/swwm_kbasetab_store.zsc
+++ b/zscript/kbase/swwm_kbasetab_store.zsc
@@ -233,7 +233,7 @@ Class DemolitionistStoreTab : DemolitionistMenuTab
 			invlist[bSell].items[i].xpos = xx;
 			invlist[bSell].items[i].ypos = yy;
 			yy += 16;
-			if ( yy >= (master.ws.y-48) )
+			if ( yy > (master.ws.y-62) )
 			{
 				xx += maxw;
 				yy = 0;
@@ -347,9 +347,11 @@ Class DemolitionistStoreTab : DemolitionistMenuTab
 			// see if we're clicking the scrollbar (if it exists)
 			if ( pos.y > (master.ws.y-21) )
 			{
-				SetOffset(pos.x);
-				master.MenuSound("menu/demoscroll");
-				drag = true;
+				if ( SetOffset(pos.x) )
+				{
+					master.MenuSound("menu/demoscroll");
+					drag = true;
+				}
 				break;
 			}
 			// find which element we clicked