Removed world timer usage from account server, instead letting ENet wait during

each host service to reduce CPU usage. Modified timer code to gracefully handle
jumps back in time.

2 files changed, 6 insertions, 3 deletions

diff --git a/src/net/connectionhandler.cpp b/src/net/connectionhandler.cpp
index 69ac9337..53ec3446 100644
--- a/src/net/connectionhandler.cpp
+++ b/src/net/connectionhandler.cpp
@@ -85,11 +85,11 @@ void ConnectionHandler::flush()
     enet_host_flush(host);
 }
 
-void ConnectionHandler::process()
+void ConnectionHandler::process(enet_uint32 timeout)
 {
     ENetEvent event;
     // Process Enet events and do not block.
-    while (enet_host_service(host, &event, 0) > 0) {
+    while (enet_host_service(host, &event, timeout) > 0) {
         switch (event.type) {
             case ENET_EVENT_TYPE_CONNECT:
             {
diff --git a/src/net/connectionhandler.hpp b/src/net/connectionhandler.hpp
index df22aacc..76bea198 100644
--- a/src/net/connectionhandler.hpp
+++ b/src/net/connectionhandler.hpp
@@ -60,8 +60,11 @@ class ConnectionHandler
         /**
          * Process outgoing messages and listen to the server socket for
          * incoming messages and new connections.
+         *
+         * @timeout an optional timeout in milliseconds to wait for something
+         *          to happen when there is nothing to do
          */
-        virtual void process();
+        virtual void process(enet_uint32 timeout = 0);
 
         /**
          * Process outgoing messages.