From 5ef9148d1f605af02e872264519eda261a3e88ca Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Tue, 14 Aug 2018 23:37:44 +0200 Subject: [PATCH 1/1] fixed ignoring mouse actions with MM engine using virtual buttons As virtual buttons do not make much sense when playing games using the Mirror Magic game engine, mouse clicks should be handled as usual even when touch input is set to "virtual buttons" (causing mouse clicks to be ignored before this change). --- graphics/gfx_classic/RocksBusy.ilbm | Bin 22090 -> 0 bytes src/events.c | 2 ++ 2 files changed, 2 insertions(+) delete mode 100644 graphics/gfx_classic/RocksBusy.ilbm diff --git a/graphics/gfx_classic/RocksBusy.ilbm b/graphics/gfx_classic/RocksBusy.ilbm deleted file mode 100644 index a5cad7ee6d97c8fe3bd6e6551e99da4e7a92d024..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22090 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 diff --git a/src/events.c b/src/events.c index 12477eea..8e368b61 100644 --- a/src/events.c +++ b/src/events.c @@ -1370,6 +1370,8 @@ static void HandleButtonOrFinger(int mx, int my, int button) HandleButtonOrFinger_WipeGestures_MM(mx, my, button); else if (strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER)) HandleButtonOrFinger_FollowFinger_MM(mx, my, button); + else if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) + SetPlayerMouseAction(mx, my, button); /* special case */ } else { -- 2.34.1