aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

server has to assign free table space for a new card so that there is no race condition

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-06-18 19:57:06 +02:00
parent 9f79bd2c8e
commit 62a9003d3e
7 changed files with 69 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/carditem.cpp
View file

@ -209,7 +209,7 @@ void CardItem::playCard(QGraphicsSceneMouseEvent *event)
bool tapped = info->getCipt();
TableZone *table = zone->getPlayer()->getTable();
QPoint gridPoint = table->getFreeGridPoint(info->getTableRow());
QPoint gridPoint = QPoint(-1, 3 - info->getTableRow());
table->handleDropEventByGrid(id, zone, gridPoint, faceDown, tapped);
}
}

2
cockatrice/src/player.cpp
View file

@ -493,7 +493,7 @@ void Player::actCreateToken()
{
QString cardname = QInputDialog::getText(0, tr("Create token"), tr("Name:"));
if (!cardname.isEmpty())
sendGameCommand(new Command_CreateToken(-1, "table", cardname, QString(), 0, 0));
sendGameCommand(new Command_CreateToken(-1, "table", cardname, QString(), -1, 0));
}
void Player::actSayMessage()

57
cockatrice/src/tablezone.cpp
View file

@ -13,10 +13,10 @@ TableZone::TableZone(Player *_p, QGraphicsItem *parent)
updateBgPixmap();
if (settingsCache->getEconomicGrid())
height = (int) (14.0 / 3 * CARD_HEIGHT + 3 * paddingY);
height = 2 * boxLineWidth + (int) (14.0 / 3 * CARD_HEIGHT + 3 * paddingY);
else
height = 4 * CARD_HEIGHT + 3 * paddingY;
width = minWidth + 2 * marginX;
height = 2 * boxLineWidth + 4 * CARD_HEIGHT + 3 * paddingY;
width = minWidth + 2 * marginX + 2 * boxLineWidth;
currentMinimumWidth = minWidth;
setCacheMode(DeviceCoordinateCache);
@ -55,17 +55,17 @@ void TableZone::paint(QPainter *painter, const QStyleOptionGraphicsItem */*optio
grad1.setCoordinateMode(QGradient::ObjectBoundingMode);
grad1.setColorAt(0, color1);
grad1.setColorAt(1, color2);
painter->fillRect(QRectF(0, 0, width, 10), QBrush(grad1));
painter->fillRect(QRectF(0, 0, width, boxLineWidth), QBrush(grad1));
grad1.setFinalStop(1, 0);
painter->fillRect(QRectF(0, 0, 10, height), QBrush(grad1));
painter->fillRect(QRectF(0, 0, boxLineWidth, height), QBrush(grad1));
grad1.setStart(0, 1);
grad1.setFinalStop(0, 0);
painter->fillRect(QRectF(0, height - 10, width, 10), QBrush(grad1));
painter->fillRect(QRectF(0, height - boxLineWidth, width, boxLineWidth), QBrush(grad1));
grad1.setStart(1, 0);
painter->fillRect(QRectF(width - 10, 0, 10, height), QBrush(grad1));
painter->fillRect(QRectF(width - boxLineWidth, 0, boxLineWidth, height), QBrush(grad1));
}
}
@ -141,7 +141,7 @@ void TableZone::resizeToContents()
xMax += 2 * CARD_WIDTH;
if (xMax < minWidth)
xMax = minWidth;
currentMinimumWidth = xMax + 2 * marginX;
currentMinimumWidth = xMax + 2 * marginX + 2 * boxLineWidth;
if (currentMinimumWidth > width) {
prepareGeometryChange();
width = currentMinimumWidth;
@ -159,28 +159,22 @@ CardItem *TableZone::getCardFromGrid(const QPoint &gridPoint) const
QPointF TableZone::mapFromGrid(const QPoint &gridPoint) const
{
if (gridPoint.y() == 3) {
if (settingsCache->getEconomicGrid())
if ((gridPoint.y() == 3) && (settingsCache->getEconomicGrid()))
return QPointF(
20 + (CARD_WIDTH * gridPoint.x() + CARD_WIDTH * (gridPoint.x() / 3)) / 2,
(CARD_HEIGHT + paddingY) * gridPoint.y() + (gridPoint.x() % 3 * CARD_HEIGHT) / 3
marginX + (CARD_WIDTH * gridPoint.x() + CARD_WIDTH * (gridPoint.x() / 3)) / 2,
boxLineWidth + (CARD_HEIGHT + paddingY) * gridPoint.y() + (gridPoint.x() % 3 * CARD_HEIGHT) / 3
);
else
return QPointF(
20 + 3 * CARD_WIDTH * gridPoint.x() / 2,
(CARD_HEIGHT + paddingY) * gridPoint.y()
);
} else
return QPointF(
20 + CARD_WIDTH * gridPoint.x() / 2,
(CARD_HEIGHT + paddingY) * gridPoint.y()
marginX + 3 * CARD_WIDTH * gridPoint.x() / 2,
boxLineWidth + (CARD_HEIGHT + paddingY) * gridPoint.y()
);
}
QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
{
qreal x = mapPoint.x() - marginX;
qreal y = mapPoint.y() + paddingY / 2;
qreal y = mapPoint.y() + paddingY / 2 - boxLineWidth;
if (x < 0)
x = 0;
else if (x > width - CARD_WIDTH - marginX)
@ -191,38 +185,19 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
y = height - CARD_HEIGHT;
QPoint result = QPoint(
(int) (x * 2 / CARD_WIDTH),
(int) (x / (1.5 * CARD_WIDTH)),
(int) (y / (CARD_HEIGHT + paddingY))
);
if (result.y() == 3) {
if (settingsCache->getEconomicGrid())
if ((result.y() == 3) && (settingsCache->getEconomicGrid()))
return QPoint(
(int) (x * 2 / CARD_WIDTH - floor(x / (2 * CARD_WIDTH))),
3
);
else
return QPoint(
(int) (x / (1.5 * CARD_WIDTH)),
3
);
} else
return result;
}
QPoint TableZone::getFreeGridPoint(int row) const
{
int x = 0;
int y = 3 - row;
if (y == 3)
while (getCardFromGrid(QPoint(x, y)))
++x;
else
while (((x >= 2) && getCardFromGrid(QPoint(x - 2, y))) || ((x >= 1) && getCardFromGrid(QPoint(x - 1, y))) || getCardFromGrid(QPoint(x, y)) || getCardFromGrid(QPoint(x + 1, y)) || getCardFromGrid(QPoint(x + 2, y)))
++x;
return QPoint(x, y);
}
QPointF TableZone::closestGridPoint(const QPointF &point)
{
return mapFromGrid(mapToGrid(point + QPoint(CARD_WIDTH / 2, CARD_HEIGHT / 2)));

10
cockatrice/src/tablezone.h
View file

@ -8,6 +8,11 @@ class TableZone : public CardZone {
signals:
void sizeChanged();
private:
static const int boxLineWidth = 10;
static const int paddingY = 20;
static const int marginX = 20;
static const int minWidth = 20 * CARD_WIDTH / 2;
int width, height;
int currentMinimumWidth;
QPixmap bgPixmap;
@ -17,10 +22,6 @@ private slots:
public slots:
void reorganizeCards();
public:
static const int paddingY = 20;
static const int marginX = 20;
static const int minWidth = 20 * CARD_WIDTH / 2;
TableZone(Player *_p, QGraphicsItem *parent = 0);
QRectF boundingRect() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
@ -30,7 +31,6 @@ public:
CardItem *getCardFromGrid(const QPoint &gridPoint) const;
QPointF mapFromGrid(const QPoint &gridPoint) const;
QPoint mapToGrid(const QPointF &mapPoint) const;
QPoint getFreeGridPoint(int row) const;
QPointF closestGridPoint(const QPointF &point);
CardItem *takeCard(int position, int cardId, const QString &cardName, bool canResize = true);
void resizeToContents();

20
common/server_cardzone.cpp
View file

@ -73,6 +73,26 @@ Server_Card *Server_CardZone::getCard(int id, bool remove, int *position)
}
}
int Server_CardZone::getFreeGridColumn(int y) const
{
int x = 0;
// Stupid algorithm. For large numbers of cards, it would be more
// efficient to sort the cards by their x value and only need to iterate once.
bool occupied;
do {
occupied = false;
for (int i = 0; i < cards.size(); ++i)
if ((cards[i]->getY() == y) && (cards[i]->getX() == x)) {
occupied = true;
++x;
break;
}
} while (occupied);
return x;
}
void Server_CardZone::insertCard(Server_Card *card, int x, int y)
{
if (hasCoords()) {

1
common/server_cardzone.h
View file

@ -47,6 +47,7 @@ public:
QString getName() const { return name; }
Server_Player *getPlayer() const { return player; }
int getFreeGridColumn(int y) const;
QList<Server_Card *> cards;
void insertCard(Server_Card *card, int x, int y);
void shuffle();

21
common/server_protocolhandler.cpp
View file

@ -515,10 +515,12 @@ ResponseCode Server_ProtocolHandler::moveCard(Server_Game *game, Server_Player *
Server_Card *card = startzone->getCard(_cardId, true, &position);
if (!card)
return RespNameNotFound;
if (!targetzone->hasCoords()) {
y = 0;
if (x == -1)
x = targetzone->cards.size();
if (!targetzone->hasCoords())
y = 0;
} else if (x == -1)
x = targetzone->getFreeGridColumn(y);
targetzone->insertCard(card, x, y);
@ -612,9 +614,18 @@ ResponseCode Server_ProtocolHandler::cmdCreateToken(Command_CreateToken *cmd, Co
if (!zone)
return RespNameNotFound;
Server_Card *card = new Server_Card(cmd->getCardName(), player->newCardId(), cmd->getX(), cmd->getY());
zone->insertCard(card, cmd->getX(), cmd->getY());
game->sendGameEvent(new Event_CreateToken(player->getPlayerId(), zone->getName(), card->getId(), card->getName(), cmd->getPt(), cmd->getX(), cmd->getY()));
int x = cmd->getX();
int y = cmd->getY();
if (zone->hasCoords() && (x == -1))
x = zone->getFreeGridColumn(y);
if (x < 0)
x = 0;
if (y < 0)
y = 0;
Server_Card *card = new Server_Card(cmd->getCardName(), player->newCardId(), x, y);
zone->insertCard(card, x, y);
game->sendGameEvent(new Event_CreateToken(player->getPlayerId(), zone->getName(), card->getId(), card->getName(), cmd->getPt(), x, y));
return RespOk;
}