From b3d947d4c3121bc6fa866a629ad62de50c12e8e0 Mon Sep 17 00:00:00 2001
From: vfjpl <cosiekvfj@o2.pl>
Date: Wed, 7 Oct 2020 03:12:04 +0200
Subject: [PATCH] Use std::deque for queues (#1112)

---
 src/client/map.cpp                     | 2 +-
 src/framework/core/eventdispatcher.cpp | 3 +--
 src/framework/core/eventdispatcher.h   | 4 ++--
 src/framework/stdext/time.h            | 5 ++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/client/map.cpp b/src/client/map.cpp
index 461cefbf..b283d830 100644
--- a/src/client/map.cpp
+++ b/src/client/map.cpp
@@ -763,7 +763,7 @@ std::tuple<std::vector<Otc::Direction>, Otc::PathFindResult> Map::findPath(const
     }
 
     std::unordered_map<Position, Node*, PositionHasher> nodes;
-    std::priority_queue<std::pair<Node*, float>, std::vector<std::pair<Node*, float>>, LessNode> searchList;
+    std::priority_queue<std::pair<Node*, float>, std::deque<std::pair<Node*, float>>, LessNode> searchList;
 
     Node *currentNode = new Node(startPos);
     currentNode->pos = startPos;
diff --git a/src/framework/core/eventdispatcher.cpp b/src/framework/core/eventdispatcher.cpp
index 11e8297d..01802a5c 100644
--- a/src/framework/core/eventdispatcher.cpp
+++ b/src/framework/core/eventdispatcher.cpp
@@ -74,7 +74,7 @@ void EventDispatcher::poll()
             event->execute();
         }
         m_pollEventsSize = m_eventList.size();
-        
+
         loops++;
     }
 }
@@ -116,4 +116,3 @@ EventPtr EventDispatcher::addEvent(const std::function<void()>& callback, bool p
         m_eventList.push_back(event);
     return event;
 }
-
diff --git a/src/framework/core/eventdispatcher.h b/src/framework/core/eventdispatcher.h
index a1435390..bb0de018 100644
--- a/src/framework/core/eventdispatcher.h
+++ b/src/framework/core/eventdispatcher.h
@@ -40,10 +40,10 @@ public:
     ScheduledEventPtr cycleEvent(const std::function<void()>& callback, int delay);
 
 private:
-    std::list<EventPtr> m_eventList;
+    std::deque<EventPtr> m_eventList;
     int m_pollEventsSize;
     stdext::boolean<false> m_disabled;
-    std::priority_queue<ScheduledEventPtr, std::vector<ScheduledEventPtr>, lessScheduledEvent> m_scheduledEventList;
+    std::priority_queue<ScheduledEventPtr, std::deque<ScheduledEventPtr>, lessScheduledEvent> m_scheduledEventList;
 };
 
 extern EventDispatcher g_dispatcher;
diff --git a/src/framework/stdext/time.h b/src/framework/stdext/time.h
index 668c3aed..f3121bcc 100644
--- a/src/framework/stdext/time.h
+++ b/src/framework/stdext/time.h
@@ -36,8 +36,8 @@ void microsleep(size_t us);
 struct timer {
 public:
     timer() { restart(); }
-    float elapsed_seconds() { return (float)((stdext::micros() - m_start)/1000000.0); }
-    ticks_t elapsed_millis() { return (stdext::micros() - m_start)/1000; }
+    float elapsed_seconds() { return (stdext::micros() - m_start) / 1000000.f; }
+    ticks_t elapsed_millis() { return (stdext::micros() - m_start) / 1000; }
     ticks_t elapsed_micros() { return stdext::micros() - m_start; }
     void restart() { m_start = stdext::micros(); }
 private:
@@ -47,4 +47,3 @@ private:
 }
 
 #endif
-