Merge branch 'develop'

SwarmMind · Sep 26, 2018 · d65045a · d65045a
2 parents 15326b5 + 4a0a03f
commit d65045a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -83,6 +83,7 @@ after_build:
   - ps: cp -r -v shaders package
   - ps: cp -r -v sound package
   - ps: cp -r -v res package
+  - ps: cp C:\deps\sfml\SFML-$env:SFML_VER\bin\openal32.dll package
 
 artifacts:
   - path: package

diff --git a/src/events/EventSystem.cpp b/src/events/EventSystem.cpp
@@ -48,9 +48,7 @@ void EventSystem::postEvents(const std::vector<TimedEvent>& events)
 void EventSystem::update(double deltaTime, double timeStamp)
 {
 	std::lock_guard<std::mutex> queueGuard{ queueLock };
-	const double now = glfwGetTime();
-	while (!eventQueue.empty() && eventQueue.top().is_due_at(now))
-	{
+	while (!eventQueue.empty() && eventQueue.top().is_due_at(timeStamp)) {
 		processEvent(eventQueue.top().get());
 		eventQueue.pop();
 	}