mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-04-28 21:07:59 +03:00
Merge branch 'master' into 'bigpeepeventsenergy'
# Conflicts: # components/sdlutil/sdlinputwrapper.cpp
This commit is contained in:
commit
04fcfcc79d
6 changed files with 62 additions and 7 deletions
|
@ -52,13 +52,15 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
|
|||
|
||||
if (windowEventsOnly)
|
||||
{
|
||||
// During loading, handle window events, discard button presses and keep others for later
|
||||
// During loading, handle window events, discard button presses and mouse movement and keep others for later
|
||||
while (SDL_PeepEvents(&evt, 1, SDL_GETEVENT, SDL_WINDOWEVENT, SDL_WINDOWEVENT) > 0)
|
||||
handleWindowEvent(evt);
|
||||
|
||||
SDL_FlushEvent(SDL_KEYDOWN);
|
||||
SDL_FlushEvent(SDL_CONTROLLERBUTTONDOWN);
|
||||
SDL_FlushEvent(SDL_MOUSEBUTTONDOWN);
|
||||
SDL_FlushEvent(SDL_MOUSEMOTION);
|
||||
SDL_FlushEvent(SDL_MOUSEWHEEL);
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue