Fixes to scores menu

CleverRaven · Dec 5, 2024 · 478501f · 478501f
1 parent 04cb3d9
commit 478501f
Show file tree

Hide file tree

Showing 3 changed files with 186 additions and 99 deletions.
diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json
@@ -4861,6 +4861,20 @@
       { "input_method": "keyboard_code", "mod": [ "ctrl" ], "key": "y" }
     ]
   },
+  {
+    "type": "keybinding",
+    "id": "TOGGLE_MONSTER_GROUP",
+    "category": "SCORES_UI",
+    "name": "Toggle monster group",
+    "bindings": [ { "input_method": "keyboard_any", "key": "m" } ]
+  },
+  {
+    "type": "keybinding",
+    "id": "TOGGLE_NPC_GROUP",
+    "category": "SCORES_UI",
+    "name": "Toggle NPC group",
+    "bindings": [ { "input_method": "keyboard_any", "key": "n" } ]
+  },
   {
     "type": "keybinding",
     "id": "HELP_KEYBINDINGS",

diff --git a/src/enum_traits.h b/src/enum_traits.h
@@ -118,4 +118,26 @@ inline bool operator!( E e )
     return !static_cast<I>( e );
 }
 
+template<typename E>
+static E &operator++( E &e )
+{
+    using I = std::underlying_type_t<E>;
+    e = static_cast<E>( static_cast<I>( e ) + 1 );
+    if( e == enum_traits<E>::last ) {
+        e = enum_traits<E>::first;
+    }
+    return e;
+}
+
+template<typename E>
+static E &operator--( E &e )
+{
+    using I = std::underlying_type_t<E>;
+    if( e == enum_traits<E>::first ) {
+        e = enum_traits<E>::last;
+    }
+    e = static_cast<E>( static_cast<I>( e ) - 1 );
+    return e;
+}
+
 #endif // CATA_SRC_ENUM_TRAITS_H