Launcher support added. Still missing UCS but thinking about maybe rewriting it completely

eqlaunch/worldserver.h

@@ -18,7 +18,8 @@
 #ifndef WORLDSERVER_H
 #define WORLDSERVER_H
 
-#include "../common/worldconn.h"
+#include "../common/net/servertalk_client_connection.h"
+#include <memory>
 #include <string>
 #include <queue>
 #include <map>
@@ -26,18 +27,19 @@
 class ZoneLaunch;
 class EQEmuConfig;
 
-class WorldServer : public WorldConnection {
+class WorldServer {
 public:
 	WorldServer(std::map<std::string, ZoneLaunch *> &zones, const char *name, const EQEmuConfig *config);
-	virtual ~WorldServer();
+	~WorldServer();
 
-	virtual void Process();
+	void HandleMessage(uint16 opcode, EQ::Net::Packet &p);
 
 	void SendStatus(const char *short_name, uint32 start_count, bool running);
 
 private:
 	virtual void OnConnected();
 
+	std::unique_ptr<EQ::Net::ServertalkClient> m_connection;
 	const char *const m_name;
 	const EQEmuConfig *const m_config;
 	std::map<std::string, ZoneLaunch *> &m_zones;