From 8a04e874945e73ceb0259de5f95101e4b7510f0a Mon Sep 17 00:00:00 2001
From: stiffly <adambylehn@hotmail.com>
Date: Tue, 23 Feb 2016 14:31:35 +0100
Subject: [PATCH] The serverlist is displayed when pressing connect button.

---
 include/Engine/GUI/MainMenuSystem.h         |  5 +++-
 include/Engine/Network/Client.h             | 13 +--------
 include/Engine/Network/EDisplayServerlist.h | 29 +++++++++++++++++++++
 src/Engine/GUI/MainMenuSystem.cpp           | 20 ++++++++++++--
 src/Engine/Network/Client.cpp               | 12 +++------
 5 files changed, 56 insertions(+), 23 deletions(-)
 create mode 100644 include/Engine/Network/EDisplayServerlist.h

diff --git a/include/Engine/GUI/MainMenuSystem.h b/include/Engine/GUI/MainMenuSystem.h
index ba69ff0d..dbba55ad 100644
--- a/include/Engine/GUI/MainMenuSystem.h
+++ b/include/Engine/GUI/MainMenuSystem.h
@@ -5,7 +5,8 @@
 #include "../Rendering/IRenderer.h"
 #include "../Core/ResourceManager.h"
 #include "../Core/Event.h"
-
+#include "../Network/ESearchForServers.h"
+#include "../Network/EDisplayServerlist.h"
 
 #include "EButtonClicked.h"
 #include "EButtonPressed.h"
@@ -27,6 +28,8 @@ private:
     bool OnButtonRelease(const Events::ButtonReleased& e);
     EventRelay<MainMenuSystem, Events::ButtonPressed> m_EPressed;
     bool OnButtonPress(const Events::ButtonPressed& e);
+    EventRelay<MainMenuSystem, Events::DisplayServerlist> m_EDisplayServerlist;
+    bool OnDisplayServerlist(const Events::DisplayServerlist& e);
 
 };
 
diff --git a/include/Engine/Network/Client.h b/include/Engine/Network/Client.h
index d08b863a..a7ac89fa 100644
--- a/include/Engine/Network/Client.h
+++ b/include/Engine/Network/Client.h
@@ -25,18 +25,7 @@
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
 #include "Network/ESearchForServers.h"
-
-struct ServerInfo
-{
-    ServerInfo(std::string a, int b, std::string c, int d)
-    {
-        Address = a; Port = b; Name = c; PlayersConnected = d;
-    }
-    std::string Address = "";
-    int Port = 0;
-    std::string Name = "";
-    int PlayersConnected = 0;
-};
+#include "Network/EDisplayServerlist.h"
 
 class Client : public Network
 {
diff --git a/include/Engine/Network/EDisplayServerlist.h b/include/Engine/Network/EDisplayServerlist.h
new file mode 100644
index 00000000..d80ad1ba
--- /dev/null
+++ b/include/Engine/Network/EDisplayServerlist.h
@@ -0,0 +1,29 @@
+#ifndef Events_DisplayServerlist_h__
+#define Events_DisplayServerlist_h__
+
+#include <string>
+#include <vector>
+#include "Core/Event.h"
+
+struct ServerInfo
+{
+    ServerInfo(std::string address, int port, std::string name, int players)
+    {
+        Address = address; Port = port; Name = name; PlayersConnected = players;
+    }
+    std::string Address = "";
+    int Port = 0;
+    std::string Name = "";
+    int PlayersConnected = 0;
+};
+
+namespace Events
+{
+
+struct DisplayServerlist : public Event 
+{
+    std::vector<ServerInfo> Serverlist;
+};
+
+}
+#endif
diff --git a/src/Engine/GUI/MainMenuSystem.cpp b/src/Engine/GUI/MainMenuSystem.cpp
index f8bf032b..946decde 100644
--- a/src/Engine/GUI/MainMenuSystem.cpp
+++ b/src/Engine/GUI/MainMenuSystem.cpp
@@ -8,6 +8,7 @@ MainMenuSystem::MainMenuSystem(SystemParams params, IRenderer* renderer)
     EVENT_SUBSCRIBE_MEMBER(m_EPressed, &MainMenuSystem::OnButtonPress);
     EVENT_SUBSCRIBE_MEMBER(m_EReleased, &MainMenuSystem::OnButtonRelease);
     EVENT_SUBSCRIBE_MEMBER(m_EClicked, &MainMenuSystem::OnButtonClick);
+    EVENT_SUBSCRIBE_MEMBER(m_EDisplayServerlist, &MainMenuSystem::OnDisplayServerlist);
 }
 
 void MainMenuSystem::Update(double dt)
@@ -19,8 +20,9 @@ bool MainMenuSystem::OnButtonClick(const Events::ButtonClicked& e)
 {
     if(e.EntityName == "Play") {
         //Run play code
-    } else if(e.EntityName == "Connect") {
-        //Run connect code
+    } else if(e.EntityName == "Connecting") {
+        LOG_INFO("Searching for LAN servers...");
+        m_EventBroker->Publish(Events::SearchForServers());
     } else if(e.EntityName == "Host") {
         //Run host code
     } else if(e.EntityName == "Quit") {
@@ -55,3 +57,17 @@ bool MainMenuSystem::OnButtonPress(const Events::ButtonPressed& e)
     return true;
 }
 
+bool MainMenuSystem::OnDisplayServerlist(const Events::DisplayServerlist& e)
+{
+    LOG_INFO("This is a serverlist V2!");
+    for (int i = 0; i < e.Serverlist.size(); i++) {
+        LOG_INFO("%s:%i\t%s\t%i/8"
+            , e.Serverlist[i].Address
+            , e.Serverlist[i].Port
+            , e.Serverlist[i].Name
+            , e.Serverlist[i].PlayersConnected
+        );
+    }
+    return true;
+}
+
diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index 903cd929..5dbeaf30 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -80,7 +80,10 @@ void Client::Update()
     if (m_SearchingForServers) {
         if (m_SearchingTime < (1000* (std::clock() - m_StartSearchTime) / (double)CLOCKS_PER_SEC)) {
             m_SearchingForServers = false;
-            displayServerlist();
+            //displayServerlist();
+            Events::DisplayServerlist e;
+            e.Serverlist = m_Serverlist;
+            m_EventBroker->Publish(e);
         }
     }
 
@@ -419,12 +422,6 @@ void Client::disconnect()
 
 bool Client::OnInputCommand(const Events::InputCommand & e)
 {
-    // TEMP
-    if (e.Command == "SearchForServers" && e.Value > 0) {
-        Events::SearchForServers e;
-        m_EventBroker->Publish(e);
-    }
-
     if (e.PlayerID != -1) {
         return false;
     }
@@ -492,7 +489,6 @@ bool Client::OnSearchForServers(const Events::SearchForServers& e)
     m_SearchingForServers = true;
     m_StartSearchTime = std::clock();
     m_Serverlist.clear();
-    LOG_INFO("Searching for LAN servers...\n");
     Packet packet(MessageType::ServerlistRequest);
     m_ServerlistRequest.Broadcast(packet, 13); // TODO: Config
     return true;