diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp index 7410c3ee6..e9a24e8dd 100644 --- a/src/Magnum/Platform/Sdl2Application.cpp +++ b/src/Magnum/Platform/Sdl2Application.cpp @@ -985,14 +985,6 @@ bool Sdl2Application::mainLoopEventIteration() { return !(_flags & Flag::Exit); } -bool Sdl2Application::mainLoopTickEventIteration() { - if(!(_flags & Flag::NoTickEvent)) { - tickEvent(); - return true; - } - return false; -} - bool Sdl2Application::mainLoopDrawEventIteration() { if(_flags & Flag::Redraw) { _flags &= ~Flag::Redraw; @@ -1021,8 +1013,8 @@ bool Sdl2Application::mainLoopIteration() { if (!mainLoopEventIteration()) return false; - /* call tickEvent() if implemented */ - mainLoopTickEventIteration(); + /* Tick event */ + if(!(_flags & Flag::NoTickEvent)) tickEvent(); /* drawEvent() was called */ if (mainLoopDrawEventIteration()) { diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index bb0aa3d73..53338e879 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -571,7 +571,7 @@ class Sdl2Application { * @return @cpp false @ce if @ref exit() was called and the application * should exit, @cpp true @ce otherwise * - * Calls @ref mainLoopEventIteration(), @ref mainLoopTickEventIteration() and + * Calls @ref mainLoopEventIteration(), @ref tickEvent() (if implemented) and * @ref mainLoopDrawEventIteration() managing the delays between them. * Called internally from @ref exec(). If you want to have better * control over how the main loop behaves, you can call this function @@ -590,14 +590,6 @@ class Sdl2Application { */ bool mainLoopEventIteration(); - /** - * @brief Calls @ref tickEvent() if implemented - * @return @cpp true @ce if @ref tickEvent() was called, @cpp false @ce otherwise - * - * Called internally from @ref mainLoopIteration(). - */ - bool mainLoopTickEventIteration(); - /** * @brief Calls @ref drawEvent() if @ref Flag::Redraw is set and unset it. * @return @cpp true @ce if @ref drawEvent() was called, @cpp false @ce otherwise