jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 16:44:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

removed some debugging warnings; fixed card name and player name display; display avatar in game

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-10-11 19:01:46 +02:00
parent fbcb34db61
commit bd06cd5796
7 changed files with 67 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/player.cpp
View file

@ -29,11 +29,10 @@ Player::Player(ServerInfo_User *info, int _id, bool _local, TabGame *_parent)
connect(settingsCache, SIGNAL(playerBgPathChanged()), this, SLOT(updateBgPixmap()));
updateBgPixmap();
// playerTarget = new PlayerTarget(CARD_WIDTH + counterAreaWidth + 5, this);
playerTarget = new PlayerTarget(this);
playerTarget->setPos(QPointF(0, 0));
playerTarget->setPos(QPointF(counterAreaWidth + (CARD_WIDTH + 5 - playerTarget->boundingRect().width()) / 2.0, 5));
QPointF base = QPointF(counterAreaWidth, 50);
QPointF base = QPointF(counterAreaWidth, 5 + playerTarget->boundingRect().height() + 10);
PileZone *deck = new PileZone(this, "deck", true, false, this);
deck->setPos(base);
@ -1049,7 +1048,7 @@ void Player::clearArrows()
void Player::rearrangeCounters()
{
qreal marginTop = 50;
qreal marginTop = 15;
qreal marginBottom = 15;
// Determine total height of bounding rectangles