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

Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-04-08 17:18:24 +02:00
commit 57aa30ffb5
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/zoneviewwidget.cpp
View file

@ -12,6 +12,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberC
: QGraphicsWidget(0, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint | Qt::WindowTitleHint/* | Qt::WindowCloseButtonHint*/), player(_player) : QGraphicsWidget(0, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint | Qt::WindowTitleHint/* | Qt::WindowCloseButtonHint*/), player(_player)
{ {
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
setZValue(100);
QFont font; QFont font;
font.setPixelSize(10); font.setPixelSize(10);

3
common/server_game.cpp
View file

@ -198,11 +198,12 @@ void Server_Game::removePlayer(Server_Player *player)
{ {
players.remove(player->getPlayerId()); players.remove(player->getPlayerId());
sendGameEvent(new Event_Leave(player->getPlayerId())); sendGameEvent(new Event_Leave(player->getPlayerId()));
bool spectator = player->getSpectator();
delete player; delete player;
if (!getPlayerCount()) if (!getPlayerCount())
deleteLater(); deleteLater();
else else if (!spectator)
stopGameIfFinished(); stopGameIfFinished();
qobject_cast<Server *>(parent())->broadcastGameListUpdate(this); qobject_cast<Server *>(parent())->broadcastGameListUpdate(this);
} }