From 35fbb7daa975d643ba98a32c5466a9dc93864527 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Thu, 7 Sep 2017 21:48:11 -0400 Subject: event order fixes --- main.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 51a5776..49d1dd9 100644 --- a/main.cpp +++ b/main.cpp @@ -130,10 +130,10 @@ int main(int argc, char *argv[]) game::time::tick(); } - while (!eventQueue.empty()) { - game::events.emit(eventQueue.back()); - eventQueue.pop_back(); - } + auto clone = eventQueue; + eventQueue.clear(); + for (auto& e : clone) + game::events.emit(e); game::engine.update(game::time::getDeltaTime()); std::this_thread::sleep_for(1ms); @@ -160,10 +160,8 @@ int main(int argc, char *argv[]) Render::render(fps); SDL_Event e; - while (SDL_PollEvent(&e)) { - ui::handleGLEvent(e); + while (SDL_PollEvent(&e)) eventQueue.push_back(e); - } } // on game end, get back together -- cgit v1.2.3