jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

thread fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-04-18 18:55:35 +02:00
parent e6fc20114e
commit 69fce1fb5d
7 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/server_game.cpp
View file

@ -31,6 +31,8 @@
Server_Game::Server_Game(Server_ProtocolHandler *_creator, int _gameId, const QString &_description, const QString &_password, int _maxPlayers, const QList<int> &_gameTypes, bool _onlyBuddies, bool _onlyRegistered, bool _spectatorsAllowed, bool _spectatorsNeedPassword, bool _spectatorsCanTalk, bool _spectatorsSeeEverything, Server_Room *_room)
: QObject(), room(_room), creatorInfo(new ServerInfo_User(_creator->getUserInfo())), gameStarted(false), gameId(_gameId), description(_description), password(_password), maxPlayers(_maxPlayers), gameTypes(_gameTypes), activePlayer(-1), activePhase(-1), onlyBuddies(_onlyBuddies), onlyRegistered(_onlyRegistered), spectatorsAllowed(_spectatorsAllowed), spectatorsNeedPassword(_spectatorsNeedPassword), spectatorsCanTalk(_spectatorsCanTalk), spectatorsSeeEverything(_spectatorsSeeEverything), inactivityCounter(0), secondsElapsed(0), gameMutex(QMutex::Recursive)
{
connect(this, SIGNAL(sigStartGameIfReady()), this, SLOT(doStartGameIfReady()), Qt::QueuedConnection);
addPlayer(_creator, false, false);
if (room->getServer()->getGameShouldPing()) {
@ -111,7 +113,7 @@ int Server_Game::getSpectatorCount() const
return result;
}
void Server_Game::startGameIfReady()
void Server_Game::doStartGameIfReady()
{
QMutexLocker locker(&gameMutex);
@ -159,6 +161,11 @@ void Server_Game::startGameIfReady()
nextTurn();
}
void Server_Game::startGameIfReady()
{
emit sigStartGameIfReady();
}
void Server_Game::stopGameIfFinished()
{
QMutexLocker locker(&gameMutex);
@ -214,6 +221,7 @@ Server_Player *Server_Game::addPlayer(Server_ProtocolHandler *handler, bool spec
int playerId = keyList.isEmpty() ? 0 : (keyList.last() + 1);
Server_Player *newPlayer = new Server_Player(this, playerId, handler->getUserInfo(), spectator, handler);
newPlayer->moveToThread(thread());
sendGameEvent(new Event_Join(newPlayer->getProperties()));
players.insert(playerId, newPlayer);