games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge branch 'develop' into incomatibility-response

Browse Source
This commit is contained in:
Nordsoft91
2022-09-25 13:26:07 +04:00
committed by GitHub
parent 824aec8416 4205701f96
commit d4f97aadf0
631 changed files with 4659 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/CServerHandler.h
View File

@@ -14,7 +14,8 @@
#include "../lib/StartInfo.h"
#include "../lib/CondSh.h"
struct SharedMemory;
VCMI_LIB_NAMESPACE_BEGIN
class CConnection;
class PlayerColor;
struct StartInfo;
@@ -23,9 +24,15 @@ class CMapInfo;
struct ClientPlayer;
struct CPack;
struct CPackForLobby;
class CClient;
template<typename T> class CApplier;
VCMI_LIB_NAMESPACE_END
struct SharedMemory;
class CClient;
class CBaseForLobbyApply;
// TODO: Add mutex so we can't set CONNECTION_CANCELLED if client already connected, but thread not setup yet
@@ -76,6 +83,7 @@ class CServerHandler : public IServerAPI, public LobbyInfo
void threadHandleConnection();
void threadRunServer();
void onServerFinished();
void sendLobbyPack(const CPackForLobby & pack) const override;
public: