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

Merge pull request #671 from kaiserfro/jo-reduce-whitespace-from-game-description

Browse source 
Reduce the game descriptions whitespace.
This commit is contained in:
Gavin Bisesi 2015-02-04 10:18:23 -05:00
commit 37a05eb731
2 changed files with 102 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/dlg_creategame.cpp
View file

@ -160,7 +160,7 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMap<int, QS
void DlgCreateGame::actOK() void DlgCreateGame::actOK()
{ {
Command_CreateGame cmd; Command_CreateGame cmd;
cmd.set_description(descriptionEdit->text().toStdString()); cmd.set_description(descriptionEdit->text().simplified().toStdString());
cmd.set_password(passwordEdit->text().toStdString()); cmd.set_password(passwordEdit->text().toStdString());
cmd.set_max_players(maxPlayersEdit->value()); cmd.set_max_players(maxPlayersEdit->value());
cmd.set_only_buddies(onlyBuddiesCheckBox->isChecked()); cmd.set_only_buddies(onlyBuddiesCheckBox->isChecked());

2
common/server_game.cpp
View file

@ -56,7 +56,6 @@ Server_Game::Server_Game(const ServerInfo_User &_creatorInfo, int _gameId, const
gameStarted(false), gameStarted(false),
gameClosed(false), gameClosed(false),
gameId(_gameId), gameId(_gameId),
description(_description),
password(_password), password(_password),
maxPlayers(_maxPlayers), maxPlayers(_maxPlayers),
gameTypes(_gameTypes), gameTypes(_gameTypes),
@ -77,6 +76,7 @@ Server_Game::Server_Game(const ServerInfo_User &_creatorInfo, int _gameId, const
{ {
currentReplay = new GameReplay; currentReplay = new GameReplay;
currentReplay->set_replay_id(room->getServer()->getDatabaseInterface()->getNextReplayId()); currentReplay->set_replay_id(room->getServer()->getDatabaseInterface()->getNextReplayId());
description = _description.simplified();
connect(this, SIGNAL(sigStartGameIfReady()), this, SLOT(doStartGameIfReady()), Qt::QueuedConnection); connect(this, SIGNAL(sigStartGameIfReady()), this, SLOT(doStartGameIfReady()), Qt::QueuedConnection);