jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-09 15:54:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Mulligan crash fix, multi-column screen alignment for multiplayer, Server Win32 compile fix

Browse source
This commit is contained in:
unknown 2011-06-05 19:45:37 +02:00
parent a03bf8884f
commit 1bc05562cc
8 changed files with 93 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/messagelogwidget.cpp
View file

@ -4,7 +4,6 @@
#include "cardinfowidget.h"
#include "protocol_items.h"
#include "soundengine.h"
#include <QDebug>
#include <QMouseEvent>
#include <QTextBlock>
@ -264,6 +263,9 @@ void MessageLogWidget::logMoveCard(Player *player, CardItem *card, CardZone *sta
void MessageLogWidget::logMulligan(Player *player, int number)
{
if (!player)
return;
if (number > -1)
append(tr("%1 takes a mulligan to %n.", "", number).arg(sanitizeHtml(player->getName())));
else
@ -468,6 +470,7 @@ void MessageLogWidget::containerProcessingStarted(GameEventContext *_context)
currentContext = MessageContext_MoveCard;
else if (qobject_cast<Context_Mulligan *>(_context)) {
currentContext = MessageContext_Mulligan;
mulliganPlayer = 0;
mulliganNumber = static_cast<Context_Mulligan *>(_context)->getNumber();
}
}
@ -482,6 +485,7 @@ void MessageLogWidget::containerProcessingDone()
moveCardTapped.clear();
} else if (currentContext == MessageContext_Mulligan) {
logMulligan(mulliganPlayer, mulliganNumber);
mulliganPlayer = 0;
mulliganNumber = 0;
}