mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Merge branch 'bigpeepeventsenergy' into 'master'
Break SDL_PeepEvents loop on error (bug #6890) Closes #6890 See merge request OpenMW/openmw!2224
This commit is contained in:
commit
9085f17a74
@ -144,6 +144,7 @@
|
|||||||
Bug #6818: ess-importer doesn't exactly reproduce camera
|
Bug #6818: ess-importer doesn't exactly reproduce camera
|
||||||
Bug #6849: ImageButton texture is not scaled properly
|
Bug #6849: ImageButton texture is not scaled properly
|
||||||
Bug #6869: Hits queue stagger during swing animation
|
Bug #6869: Hits queue stagger during swing animation
|
||||||
|
Bug #6890: SDL_PeepEvents errors are not handled
|
||||||
Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
|
Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
|
||||||
Bug #6896: Sounds played using PlaySound3D are cut off as the emitter leaves the cell
|
Bug #6896: Sounds played using PlaySound3D are cut off as the emitter leaves the cell
|
||||||
Bug #6898: Accessing the Quick Inventory menu does not work while in menu mode
|
Bug #6898: Accessing the Quick Inventory menu does not work while in menu mode
|
||||||
|
@ -53,7 +53,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
|
|||||||
if (windowEventsOnly)
|
if (windowEventsOnly)
|
||||||
{
|
{
|
||||||
// During loading, handle window events, discard button presses and mouse movement 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))
|
while (SDL_PeepEvents(&evt, 1, SDL_GETEVENT, SDL_WINDOWEVENT, SDL_WINDOWEVENT) > 0)
|
||||||
handleWindowEvent(evt);
|
handleWindowEvent(evt);
|
||||||
|
|
||||||
SDL_FlushEvent(SDL_KEYDOWN);
|
SDL_FlushEvent(SDL_KEYDOWN);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user