gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-21 23:00:24 -08:00
Code Issues Packages Projects Releases Wiki Activity

more mutexes

Browse Source
This commit is contained in:
Max-Wilhelm Bruker
2011-03-22 19:37:56 +01:00
parent 4548841a93
commit 81a5d58d70
10 changed files with 127 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
common/server_player.cpp
View File

@@ -17,6 +17,8 @@ Server_Player::Server_Player(Server_Game *_game, int _playerId, ServerInfo_User
Server_Player::~Server_Player()
{
QMutexLocker locker(&game->gameMutex);
delete deck;
if (handler)
@@ -28,11 +30,15 @@ Server_Player::~Server_Player()
int Server_Player::newCardId()
{
QMutexLocker locker(&game->gameMutex);
return nextCardId++;
}
int Server_Player::newCounterId() const
{
QMutexLocker locker(&game->gameMutex);
int id = 0;
QMapIterator<int, Server_Counter *> i(counters);
while (i.hasNext()) {
@@ -45,6 +51,8 @@ int Server_Player::newCounterId() const
int Server_Player::newArrowId() const
{
QMutexLocker locker(&game->gameMutex);
int id = 0;
QMapIterator<int, Server_Arrow *> i(arrows);
while (i.hasNext()) {
@@ -57,6 +65,8 @@ int Server_Player::newArrowId() const
void Server_Player::setupZones()
{
QMutexLocker locker(&game->gameMutex);
// This may need to be customized according to the game rules.
// ------------------------------------------------------------------
@@ -138,6 +148,8 @@ void Server_Player::setupZones()
void Server_Player::clearZones()
{
QMutexLocker locker(&game->gameMutex);
QMapIterator<QString, Server_CardZone *> zoneIterator(zones);
while (zoneIterator.hasNext())
delete zoneIterator.next().value();
@@ -158,11 +170,15 @@ void Server_Player::clearZones()
ServerInfo_PlayerProperties *Server_Player::getProperties()
{
QMutexLocker locker(&game->gameMutex);
return new ServerInfo_PlayerProperties(playerId, new ServerInfo_User(userInfo), spectator, conceded, readyStart, deckId);
}
void Server_Player::setDeck(DeckList *_deck, int _deckId)
{
QMutexLocker locker(&game->gameMutex);
delete deck;
deck = _deck;
deckId = _deckId;
@@ -170,16 +186,22 @@ void Server_Player::setDeck(DeckList *_deck, int _deckId)
void Server_Player::addZone(Server_CardZone *zone)
{
QMutexLocker locker(&game->gameMutex);
zones.insert(zone->getName(), zone);
}
void Server_Player::addArrow(Server_Arrow *arrow)
{
QMutexLocker locker(&game->gameMutex);
arrows.insert(arrow->getId(), arrow);
}
bool Server_Player::deleteArrow(int arrowId)
{
QMutexLocker locker(&game->gameMutex);
Server_Arrow *arrow = arrows.value(arrowId, 0);
if (!arrow)
return false;
@@ -190,11 +212,15 @@ bool Server_Player::deleteArrow(int arrowId)
void Server_Player::addCounter(Server_Counter *counter)
{
QMutexLocker locker(&game->gameMutex);
counters.insert(counter->getId(), counter);
}
bool Server_Player::deleteCounter(int counterId)
{
QMutexLocker locker(&game->gameMutex);
Server_Counter *counter = counters.value(counterId, 0);
if (!counter)
return false;
@@ -205,6 +231,8 @@ bool Server_Player::deleteCounter(int counterId)
ResponseCode Server_Player::drawCards(CommandContainer *cont, int number)
{
QMutexLocker locker(&game->gameMutex);
Server_CardZone *deckZone = zones.value("deck");
Server_CardZone *handZone = zones.value("hand");
if (deckZone->cards.size() < number)
@@ -228,6 +256,8 @@ ResponseCode Server_Player::drawCards(CommandContainer *cont, int number)
ResponseCode Server_Player::undoDraw(CommandContainer *cont)
{
QMutexLocker locker(&game->gameMutex);
if (lastDrawList.isEmpty())
return RespContextError;
@@ -240,6 +270,8 @@ ResponseCode Server_Player::undoDraw(CommandContainer *cont)
ResponseCode Server_Player::moveCard(CommandContainer *cont, const QString &_startZone, const QList<CardToMove *> &_cards, int targetPlayerId, const QString &_targetZone, int x, int y, bool faceDown)
{
QMutexLocker locker(&game->gameMutex);
Server_CardZone *startzone = getZones().value(_startZone);
Server_Player *targetPlayer = game->getPlayers().value(targetPlayerId);
if (!targetPlayer)
@@ -274,6 +306,8 @@ public:
ResponseCode Server_Player::moveCard(CommandContainer *cont, Server_CardZone *startzone, const QList<CardToMove *> &_cards, Server_CardZone *targetzone, int x, int y, bool faceDown, bool fixFreeSpaces, bool undoingDraw)
{
QMutexLocker locker(&game->gameMutex);
// Disallow controller change to other zones than the table.
if (((targetzone->getType() != PublicZone) || !targetzone->hasCoords()) && (startzone->getPlayer() != targetzone->getPlayer()))
return RespContextError;
@@ -428,6 +462,8 @@ ResponseCode Server_Player::moveCard(CommandContainer *cont, Server_CardZone *st
void Server_Player::unattachCard(CommandContainer *cont, Server_Card *card)
{
QMutexLocker locker(&game->gameMutex);
Server_CardZone *zone = card->getZone();
card->setParentCard(0);
@@ -441,6 +477,8 @@ void Server_Player::unattachCard(CommandContainer *cont, Server_Card *card)
ResponseCode Server_Player::setCardAttrHelper(CommandContainer *cont, const QString &zoneName, int cardId, const QString &attrName, const QString &attrValue)
{
QMutexLocker locker(&game->gameMutex);
Server_CardZone *zone = getZones().value(zoneName);
if (!zone)
return RespNameNotFound;
@@ -471,6 +509,8 @@ ResponseCode Server_Player::setCardAttrHelper(CommandContainer *cont, const QStr
void Server_Player::sendProtocolItem(ProtocolItem *item, bool deleteItem)
{
QMutexLocker locker(&playerMutex);
if (handler)
handler->sendProtocolItem(item, deleteItem);
}