reorganized client state

[blank.git] / src / net / Client.hpp

diff --git a/src/net/Client.hpp b/src/net/Client.hpp
index 5b83061ae48abc917e5bc5af5130a77a89a5d01f..3960e845c9fed551ae15b2046013bab7504af3a2 100644 (file)
--- a/src/net/Client.hpp
+++ b/src/net/Client.hpp
@@ -20,14 +20,15 @@ public:
        };
 
 public:
-       Client(const Config &, World &);
+       explicit Client(const Config &);
        ~Client();
 
        void Handle();
 
        void Update(int dt);
 
-       bool TimedOut() { return conn.TimedOut(); }
+       Connection &GetConnection() noexcept { return conn; }
+       const Connection &GetConnection() const noexcept { return conn; }
 
        void SendPing();
        void SendLogin(const std::string &);
@@ -36,7 +37,6 @@ private:
        void HandlePacket(const UDPpacket &);
 
 private:
-       World &world;
        Connection conn;
        UDPsocket client_sock;
        UDPpacket client_pack;