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

Merge pull request #1272 from Fizztastic/fix_577

Browse source 
Joining a full game joins you as spectator
This commit is contained in:
Zach 2015-07-25 22:16:00 -07:00
commit c675cf4010
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/gameselector.cpp
View file

@ -157,12 +157,11 @@ void GameSelector::checkResponse(const Response &response)
void GameSelector::actJoin() void GameSelector::actJoin()
{ {
bool spectator = sender() == spectateButton;
QModelIndex ind = gameListView->currentIndex(); QModelIndex ind = gameListView->currentIndex();
if (!ind.isValid()) if (!ind.isValid())
return; return;
const ServerInfo_Game &game = gameListModel->getGame(ind.data(Qt::UserRole).toInt()); const ServerInfo_Game &game = gameListModel->getGame(ind.data(Qt::UserRole).toInt());
bool spectator = sender() == spectateButton || game.player_count() == game.max_players();
bool overrideRestrictions = !tabSupervisor->getAdminLocked(); bool overrideRestrictions = !tabSupervisor->getAdminLocked();
QString password; QString password;
if (game.with_password() && !(spectator && !game.spectators_need_password()) && !overrideRestrictions) { if (game.with_password() && !(spectator && !game.spectators_need_password()) && !overrideRestrictions) {