mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-27 07:48:01 -07:00
Mulligan crash fix, multi-column screen alignment for multiplayer, Server Win32 compile fix
This commit is contained in:
parent
a03bf8884f
commit
1bc05562cc
8 changed files with 93 additions and 57 deletions
|
|
@ -1007,7 +1007,6 @@ void Player::eventDrawCards(Event_DrawCards *event)
|
|||
|
||||
hand->reorganizeCards();
|
||||
deck->reorganizeCards();
|
||||
|
||||
emit logDrawCards(this, event->getNumberCards());
|
||||
}
|
||||
|
||||
|
|
@ -1545,12 +1544,9 @@ void Player::setMirrored(bool _mirrored)
|
|||
}
|
||||
}
|
||||
|
||||
void Player::processSceneSizeChange(const QSizeF &newSize)
|
||||
void Player::processSceneSizeChange(int newPlayerWidth)
|
||||
{
|
||||
// This will need to be changed if player areas are displayed side by side (e.g. 2x2 for a 4-player game)
|
||||
qreal fullPlayerWidth = newSize.width();
|
||||
|
||||
qreal tableWidth = fullPlayerWidth - CARD_HEIGHT - 15 - counterAreaWidth - stack->boundingRect().width();
|
||||
qreal tableWidth = newPlayerWidth - CARD_HEIGHT - 15 - counterAreaWidth - stack->boundingRect().width();
|
||||
if (!settingsCache->getHorizontalHand())
|
||||
tableWidth -= hand->boundingRect().width();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue