|
@@ -14,8 +14,6 @@
|
|
|
#include "../lib/StartInfo.h"
|
|
#include "../lib/StartInfo.h"
|
|
|
#include "../lib/CondSh.h"
|
|
#include "../lib/CondSh.h"
|
|
|
|
|
|
|
|
-#include "mainmenu/CHighScoreScreen.h"
|
|
|
|
|
-
|
|
|
|
|
VCMI_LIB_NAMESPACE_BEGIN
|
|
VCMI_LIB_NAMESPACE_BEGIN
|
|
|
|
|
|
|
|
class CConnection;
|
|
class CConnection;
|
|
@@ -37,6 +35,9 @@ VCMI_LIB_NAMESPACE_END
|
|
|
class CClient;
|
|
class CClient;
|
|
|
class CBaseForLobbyApply;
|
|
class CBaseForLobbyApply;
|
|
|
|
|
|
|
|
|
|
+class HighScoreCalculation;
|
|
|
|
|
+class HighScoreParameter;
|
|
|
|
|
+
|
|
|
// TODO: Add mutex so we can't set CONNECTION_CANCELLED if client already connected, but thread not setup yet
|
|
// TODO: Add mutex so we can't set CONNECTION_CANCELLED if client already connected, but thread not setup yet
|
|
|
enum class EClientState : ui8
|
|
enum class EClientState : ui8
|
|
|
{
|
|
{
|
|
@@ -88,7 +89,7 @@ class CServerHandler : public IServerAPI, public LobbyInfo
|
|
|
|
|
|
|
|
std::vector<std::string> myNames;
|
|
std::vector<std::string> myNames;
|
|
|
|
|
|
|
|
- HighScoreCalculation calc;
|
|
|
|
|
|
|
+ std::shared_ptr<HighScoreCalculation> calc;
|
|
|
|
|
|
|
|
void threadHandleConnection();
|
|
void threadHandleConnection();
|
|
|
void threadRunServer();
|
|
void threadRunServer();
|