From 19d0de3cea0adb9f554bbea7ecc5ef09e8d89103 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Mon, 28 Jun 2021 03:37:50 +0000
Subject: [PATCH] Move weapon reorder menu subfunction handling to
 event_handler

---
 similar/main/weapon.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/similar/main/weapon.cpp b/similar/main/weapon.cpp
index 873243967..5e316a77a 100644
--- a/similar/main/weapon.cpp
+++ b/similar/main/weapon.cpp
@@ -229,6 +229,7 @@ struct weapon_reorder_menu : weapon_reorder_menu_items<cycle_weapon_state>, reor
 	{
 	}
 	virtual int subfunction_handler(const d_event &event) override;
+	virtual window_event_result event_handler(const d_event &event) override;
 };
 
 template <typename cycle_weapon_state>
@@ -244,6 +245,13 @@ weapon_reorder_menu_items<cycle_weapon_state>::weapon_reorder_menu_items()
 
 template <typename cycle_weapon_state>
 int weapon_reorder_menu<cycle_weapon_state>::subfunction_handler(const d_event &event)
+{
+	(void)event;
+	return 0;
+}
+
+template <typename cycle_weapon_state>
+window_event_result weapon_reorder_menu<cycle_weapon_state>::event_handler(const d_event &event)
 {
 	switch(event.type)
 	{
@@ -257,7 +265,7 @@ int weapon_reorder_menu<cycle_weapon_state>::subfunction_handler(const d_event &
 		default:
 			break;
 	}
-	return 0;
+	return newmenu::event_handler(event);
 }
 
 }