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

Review

Browse source
This commit is contained in:
Basile Clément 2025-03-16 09:12:49 +01:00
parent e9bbaf4716
commit 2792785bbd
No known key found for this signature in database
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cockatrice/src/game/player/player.cpp
View file

@ -124,7 +124,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
qreal avatarMargin = (counterAreaWidth + CARD_HEIGHT + 15 - playerTarget->boundingRect().width()) / 2.0; qreal avatarMargin = (counterAreaWidth + CARD_HEIGHT + 15 - playerTarget->boundingRect().width()) / 2.0;
playerTarget->setPos(QPointF(avatarMargin, avatarMargin)); playerTarget->setPos(QPointF(avatarMargin, avatarMargin));
auto *_deck = addZone<PileZone>(this, "deck", true, false, playerArea); auto *_deck = addZone(new PileZone(this, "deck", true, false, playerArea));
QPointF base = QPointF(counterAreaWidth + (CARD_HEIGHT - CARD_WIDTH + 15) / 2.0, QPointF base = QPointF(counterAreaWidth + (CARD_HEIGHT - CARD_WIDTH + 15) / 2.0,
10 + playerTarget->boundingRect().height() + 5 - (CARD_HEIGHT - CARD_WIDTH) / 2.0); 10 + playerTarget->boundingRect().height() + 5 - (CARD_HEIGHT - CARD_WIDTH) / 2.0);
_deck->setPos(base); _deck->setPos(base);
@ -135,23 +135,23 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
handCounter->setPos(base + QPointF(0, h + 10)); handCounter->setPos(base + QPointF(0, h + 10));
qreal h2 = handCounter->boundingRect().height(); qreal h2 = handCounter->boundingRect().height();
PileZone *grave = addZone<PileZone>(this, "grave", false, true, playerArea); PileZone *grave = addZone(new PileZone(this, "grave", false, true, playerArea));
grave->setPos(base + QPointF(0, h + h2 + 10)); grave->setPos(base + QPointF(0, h + h2 + 10));
PileZone *rfg = addZone<PileZone>(this, "rfg", false, true, playerArea); PileZone *rfg = addZone(new PileZone(this, "rfg", false, true, playerArea));
rfg->setPos(base + QPointF(0, 2 * h + h2 + 10)); rfg->setPos(base + QPointF(0, 2 * h + h2 + 10));
PileZone *sb = addZone<PileZone>(this, "sb", false, false, playerArea); PileZone *sb = addZone(new PileZone(this, "sb", false, false, playerArea));
sb->setVisible(false); sb->setVisible(false);
table = addZone<TableZone>(this, this); table = addZone(new TableZone(this, this));
connect(table, &TableZone::sizeChanged, this, &Player::updateBoundingRect); connect(table, &TableZone::sizeChanged, this, &Player::updateBoundingRect);
stack = addZone<StackZone>(this, (int)table->boundingRect().height(), this); stack = addZone(new StackZone(this, (int)table->boundingRect().height(), this));
hand = hand = addZone(new HandZone(this,
addZone<HandZone>(this, _local || _judge || (_parent->getSpectator() && _parent->getSpectatorsSeeEverything()), _local || _judge || (_parent->getSpectator() && _parent->getSpectatorsSeeEverything()),
(int)table->boundingRect().height(), this); (int)table->boundingRect().height(), this));
connect(hand, &HandZone::cardCountChanged, handCounter, &HandCounter::updateNumber); connect(hand, &HandZone::cardCountChanged, handCounter, &HandCounter::updateNumber);
connect(handCounter, &HandCounter::showContextMenu, hand, &HandZone::showContextMenu); connect(handCounter, &HandCounter::showContextMenu, hand, &HandZone::showContextMenu);

3
cockatrice/src/game/player/player.h
View file

@ -410,9 +410,8 @@ public:
void addCard(CardItem *c); void addCard(CardItem *c);
void deleteCard(CardItem *c); void deleteCard(CardItem *c);
template <typename T, typename... Args> T *addZone(Args &&...args) template <typename T> T *addZone(T *zone)
{ {
T *zone = new T(std::forward<Args>(args)...);
zones.insert(zone->getName(), zone); zones.insert(zone->getName(), zone);
return zone; return zone;
} }