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

minor visual change, server crash fix, multiplayer leave/concede fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-02-15 22:50:16 +01:00
parent 6bdc8914a9
commit d4f600393f
10 changed files with 169 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

37
cockatrice/src/tab_game.cpp
View file

@ -477,6 +477,10 @@ void TabGame::startGame()
}
mainLayout->removeItem(deckViewContainerLayout);
QMapIterator<int, Player *> playerIterator(players);
while (playerIterator.hasNext())
playerIterator.next().value()->setConceded(false);
playerListWidget->setGameStarted(true);
started = true;
gameView->show();
@ -581,7 +585,16 @@ void TabGame::eventPlayerPropertiesChanged(Event_PlayerPropertiesChanged *event,
messageLog->logNotReadyStart(player);
break;
}
case ItemId_Context_Concede: messageLog->logConcede(player); break;
case ItemId_Context_Concede: {
messageLog->logConcede(player);
player->setConceded(true);
QMapIterator<int, Player *> playerIterator(players);
while (playerIterator.hasNext())
playerIterator.next().value()->updateZones();
break;
}
case ItemId_Context_DeckSelect: messageLog->logDeckSelect(player, static_cast<Context_DeckSelect *>(context)->getDeckId()); break;
default: ;
}
@ -609,13 +622,21 @@ void TabGame::eventLeave(Event_Leave *event, GameEventContext * /*context*/)
int playerId = event->getPlayerId();
Player *player = players.value(playerId, 0);
if (player) {
messageLog->logLeave(player);
playerListWidget->removePlayer(playerId);
players.remove(playerId);
emit playerRemoved(player);
player->deleteLater();
}
if (!player)
return;
messageLog->logLeave(player);
playerListWidget->removePlayer(playerId);
players.remove(playerId);
emit playerRemoved(player);
player->clear();
player->deleteLater();
// Rearrange all remaining zones so that attachment relationship updates take place
QMapIterator<int, Player *> playerIterator(players);
while (playerIterator.hasNext())
playerIterator.next().value()->updateZones();
emit userEvent();
}