jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

deck storage is fully working again, cleaned up some unnecessarily large messages

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-01-02 15:46:14 +01:00
parent d4aaf9fff5
commit 0c9a2b061c
13 changed files with 110 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/server_room.cpp
View file

@ -32,17 +32,20 @@ Server *Server_Room::getServer() const
return static_cast<Server *>(parent());
}
ServerInfo_Room Server_Room::getInfo(bool complete, bool showGameTypes) const
ServerInfo_Room Server_Room::getInfo(bool complete, bool showGameTypes, bool updating) const
{
QMutexLocker locker(&roomMutex);
ServerInfo_Room result;
result.set_room_id(id);
result.set_name(name.toStdString());
result.set_description(description.toStdString());
result.set_game_count(games.size());
result.set_player_count(size());
result.set_auto_join(autoJoin);
if (!updating) {
result.set_name(name.toStdString());
result.set_description(description.toStdString());
result.set_auto_join(autoJoin);
}
if (complete) {
QMapIterator<int, Server_Game *> gameIterator(games);