jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 08:14:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

more ISL code, mutex fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-03-12 00:36:44 +01:00
parent 0ae18d7b2e
commit 572e4eaafa
9 changed files with 107 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/server.h
View file

@ -6,6 +6,7 @@
#include <QMap>
#include <QMutex>
#include "pb/serverinfo_user.pb.h"
#include "pb/serverinfo_room.pb.h"
class Server_Game;
class Server_Room;
@ -26,7 +27,7 @@ class Server : public QObject
signals:
void pingClockTimeout();
private slots:
void broadcastRoomUpdate();
void broadcastRoomUpdate(const ServerInfo_Room &roomInfo, bool sendToIsl = false);
public:
mutable QMutex serverMutex;
Server(QObject *parent = 0);
@ -68,6 +69,7 @@ public:
protected slots:
void externalUserJoined(ServerInfo_User userInfo);
void externalUserLeft(QString userName);
void externalRoomUpdated(ServerInfo_Room roomInfo);
protected:
void prepareDestroy();
QList<Server_ProtocolHandler *> clients;