mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-01 02:53:56 -07:00
Merge pull request #1991 from ctrlaltca/websockets
Implementation of websockets in servatrice and test js client
This commit is contained in:
commit
6a152ffbac
42 changed files with 39592 additions and 287 deletions
|
|
@ -3,7 +3,7 @@
|
|||
#include "server_room.h"
|
||||
|
||||
LocalServer::LocalServer(QObject *parent)
|
||||
: Server(false, parent)
|
||||
: Server(parent)
|
||||
{
|
||||
setDatabaseInterface(new LocalServer_DatabaseInterface(this));
|
||||
addRoom(new Server_Room(0, 0, QString(), QString(), QString(), false, QString(), QStringList(), this));
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public:
|
|||
AuthenticationResult checkUserPassword(Server_ProtocolHandler *handler, const QString &user, const QString &password, const QString &clientId, QString &reasonStr, int &secondsLeft);
|
||||
int getNextGameId() { return localServer->getNextLocalGameId(); }
|
||||
int getNextReplayId() { return -1; }
|
||||
int getActiveUserCount() { return 0; }
|
||||
int getActiveUserCount(QString /* connectionType */) { return 0; }
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ public:
|
|||
~LocalServerInterface();
|
||||
|
||||
QString getAddress() const { return QString(); }
|
||||
QString getConnectionType() const { return "local"; };
|
||||
void transmitProtocolItem(const ServerMessage &item);
|
||||
signals:
|
||||
void itemToClient(const ServerMessage &item);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue