From e92b7cf2696c0088e4e62fe74d2488e8c24d8261 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Thu, 2 Jun 2022 00:25:49 +0200
Subject: [PATCH] Cleaner way of fetching inputs in intermission.

---
 language.version            |  4 ++--
 zscript/menu/swwm_inter.zsc | 38 +++++++++----------------------------
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/language.version b/language.version
index 1f828f1a4..954a0937f 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.21 \cu(Wed  1 Jun 18:33:35 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.2.21 \cu(2022-06-01 18:33:35)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.21 \cu(Tue  7 Jun 12:01:07 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.2.21 \cu(2022-06-07 12:01:07)\c-";
diff --git a/zscript/menu/swwm_inter.zsc b/zscript/menu/swwm_inter.zsc
index fd0ecbbf8..4e785b6c3 100644
--- a/zscript/menu/swwm_inter.zsc
+++ b/zscript/menu/swwm_inter.zsc
@@ -297,40 +297,25 @@ Class SWWMStatScreen : StatusScreen abstract
 	{
 		if ( evt.type == InputEvent.Type_KeyDown )
 		{
-			Array<int> usekey, firekey, altfirekey, reloadkey, zoomkey;
-			Bindings.GetAllKeysForCommand(usekey,"+use");
-			for ( int i=0; i<usekey.Size(); i++ )
+			String cmd = Bindings.GetBinding(evt.KeyScan);
+			if ( (cmd ~== "+attack") || (cmd ~== "+use") )
 			{
-				if ( evt.KeyScan != usekey[i] ) continue;
 				accelerateStage = 1;
 				return true;
 			}
-			Bindings.GetAllKeysForCommand(firekey,"+attack");
-			for ( int i=0; i<firekey.Size(); i++ )
+			if ( cmd ~== "+altattack" )
 			{
-				if ( evt.KeyScan != firekey[i] ) continue;
-				accelerateStage = 1;
-				return true;
-			}
-			Bindings.GetAllKeysForCommand(altfirekey,"+altattack");
-			for ( int i=0; i<altfirekey.Size(); i++ )
-			{
-				if ( evt.KeyScan != altfirekey[i] ) continue;
 				bFade = true;
 				return true;
 			}
-			Bindings.GetAllKeysForCommand(reloadkey,"+reload");
-			for ( int i=0; i<reloadkey.Size(); i++ )
+			if ( cmd ~== "+reload" )
 			{
-				if ( evt.KeyScan != reloadkey[i] ) continue;
 				if ( !swwm_nointertips ) PlaySound("menu/demoscroll");
 				whichtip = 0;
 				return true;
 			}
-			Bindings.GetAllKeysForCommand(zoomkey,"+zoom");
-			for ( int i=0; i<zoomkey.Size(); i++ )
+			if ( cmd ~== "+zoom" )
 			{
-				if ( evt.KeyScan != zoomkey[i] ) continue;
 				if ( swwm_interart ) PlaySound("menu/demoscroll");
 				whichart = 0;
 				arttex.SetNull();
@@ -338,16 +323,11 @@ Class SWWMStatScreen : StatusScreen abstract
 			}
 			return false;
 		}
-		else if ( evt.type == InputEvent.Type_KeyUp )
+		else if ( (evt.type == InputEvent.Type_KeyUp)
+			&& (Bindings.GetBinding(evt.KeyScan) ~== "+altattack") )
 		{
-			Array<int> altfirekey;
-			Bindings.GetAllKeysForCommand(altfirekey,"+altattack");
-			for ( int i=0; i<altfirekey.Size(); i++ )
-			{
-				if ( evt.KeyScan != altfirekey[i] ) continue;
-				bFade = false;
-				return true;
-			}
+			bFade = false;
+			return true;
 		}
 		return false;
 	}