Merge remote-tracking branch 'origin/FriendlyHost/Join' into Menu
# Conflicts: # include/Game/Systems/MainMenuSystem.h # src/Engine/GUI/MainMenuSystem.cpp
This commit is contained in:
@@ -7,6 +7,8 @@
|
||||
#include "Core/Event.h"
|
||||
#include "Systems/SpawnerSystem.h"
|
||||
|
||||
#include "Network/ESearchForServers.h"
|
||||
|
||||
class ServerListSystem : public PureSystem
|
||||
{
|
||||
public:
|
||||
@@ -17,6 +19,9 @@ public:
|
||||
|
||||
private:
|
||||
IRenderer* m_Renderer;
|
||||
|
||||
//EventRelay<ServerListSystem, Events::SomeEventLol> m_EServerListRecieved;
|
||||
//bool OnServerListRecieved(const Events::SomeEventLol& e)
|
||||
};
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user