OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/origin/master' into localization

Browse source 
# Conflicts:
#	src/v_font.cpp
This commit is contained in:
Christoph Oelckers 2019-02-16 17:35:15 +01:00
commit d15e3391a0
11 changed files with 421 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/posix/sdl/i_input.cpp
View file

@ -379,7 +379,12 @@ void MessagePump (const SDL_Event &sev)
else
{
event.type = EV_KeyDown;
event.data1 = sev.wheel.y > 0 ? KEY_MWHEELUP : KEY_MWHEELDOWN;
if (sev.wheel.y != 0)
event.data1 = sev.wheel.y > 0 ? KEY_MWHEELUP : KEY_MWHEELDOWN;
else
event.data1 = sev.wheel.x > 0 ? KEY_MWHEELRIGHT : KEY_MWHEELLEFT;
D_PostEvent (&event);
event.type = EV_KeyUp;
D_PostEvent (&event);