keybinds: ticks always propagate

Author: malytomas

sources/include/cage-engine/keybinds.h

@@ -81,8 +81,6 @@ namespace cage
 		struct CAGE_ENGINE_API EngineTick
 		{};
 	}
-	CAGE_ENGINE_API void keybindsDispatchGameTick();
-	CAGE_ENGINE_API void keybindsDispatchEngineTick();
 
 	CAGE_ENGINE_API void keybindsGuiWidget(guiBuilder::GuiBuilder *g, Keybind *keybind);
 	CAGE_ENGINE_API void keybindsGuiTable(guiBuilder::GuiBuilder *g, const String &filterPrefix = {});

sources/libengine/keybinds.cpp

@@ -228,9 +228,17 @@ namespace cage
 				if (active)
 				{
 					if (input.has<input::GameTick>() && any(config.modes & KeybindModesFlags::GameTick))
-						return event(input);
+					{
+						if (event)
+							event(input);
+						return false; // ticks always propagate
+					}
 					if (input.has<input::EngineTick>() && any(config.modes & KeybindModesFlags::EngineTick))
-						return event(input);
+					{
+						if (event)
+							event(input);
+						return false; // ticks always propagate
+					}
 				}
 				for (const auto &it : matchers)
 				{
@@ -521,20 +529,6 @@ namespace cage
 		}
 	}
 
-	void keybindsDispatchGameTick()
-	{
-		GenericInput g = input::GameTick();
-		for (KeybindImpl *it : global())
-			it->process(g);
-	}
-
-	void keybindsDispatchEngineTick()
-	{
-		GenericInput g = input::EngineTick();
-		for (KeybindImpl *it : global())
-			it->process(g);
-	}
-
 	void keybindsGuiWidget(GuiBuilder *g, Keybind *k_)
 	{
 		KeybindImpl *k = (KeybindImpl *)k_;

sources/libsimple/gameloop.cpp

@@ -355,7 +355,7 @@ namespace cage
 				}
 				{
 					ProfilingScope profiling("keybinds engine tick");
-					keybindsDispatchEngineTick();
+					engineEvents().dispatch(input::EngineTick());
 				}
 				{
 					ProfilingScope profiling("control callback");