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

more spectator code

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-09-16 01:40:49 +02:00
parent cdfe0e0301
commit ab3858239f
13 changed files with 62 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
cockatrice/src/client.cpp
View file

@ -131,15 +131,28 @@ void Client::readLine()
resp = RespErr; resp = RespErr;
emit responseReceived(msgid, resp); emit responseReceived(msgid, resp);
} else if (prefix == "list_games") { } else if (prefix == "list_games") {
emit gameListEvent(new ServerGame(values[0].toInt(), values[5], values[1], values[2].toInt(), values[3].toInt(), values[4].toInt())); if (values.size() != 8)
} else if ((prefix == "list_players") || (prefix == "list_counters") || (prefix == "list_zones") || (prefix == "dump_zone") || (prefix == "welcome")) { return;
emit gameListEvent(new ServerGame(values[0].toInt(), values[5], values[1], values[2].toInt(), values[3].toInt(), values[4].toInt(), values[6].toInt(), values[7].toInt()));
} else if (prefix == "welcome") {
if (values.size() != 2) {
emit protocolVersionMismatch();
disconnectFromServer();
} else if (values[0].toInt() != protocolVersion) {
emit protocolVersionMismatch();
disconnectFromServer();
} else {
emit welcomeMsgReceived(values[1]);
setStatus(StatusLoggingIn);
login(playerName, password);
}
} else if ((prefix == "list_players") || (prefix == "list_counters") || (prefix == "list_zones") || (prefix == "dump_zone")) {
int cmdid = values.takeFirst().toInt(); int cmdid = values.takeFirst().toInt();
if (values[0] == ".") { if (values[0] == ".") {
QListIterator<QStringList> i(msgbuf); QListIterator<QStringList> i(msgbuf);
QList<ServerPlayer *> playerlist; QList<ServerPlayer *> playerlist;
QList<ServerZone *> zonelist; QList<ServerZone *> zonelist;
QList<ServerZoneCard *> zonedump; QList<ServerZoneCard *> zonedump;
QStringList welcomemsg;
while (i.hasNext()) { while (i.hasNext()) {
QStringList val = i.next(); QStringList val = i.next();
@ -152,8 +165,6 @@ void Client::readLine()
zonelist << new ServerZone(val[0], val[1] == "1", val[2] == "1", val[3].toInt()); zonelist << new ServerZone(val[0], val[1] == "1", val[2] == "1", val[3].toInt());
else if (prefix == "dump_zone") else if (prefix == "dump_zone")
zonedump << new ServerZoneCard(val[0].toInt(), val[1], val[2].toInt(), val[3].toInt(), val[4].toInt(), val[5] == "1", val[6]); zonedump << new ServerZoneCard(val[0].toInt(), val[1], val[2].toInt(), val[3].toInt(), val[4].toInt(), val[5] == "1", val[6]);
else if (prefix == "welcome")
welcomemsg << val[0];
} }
if (prefix == "list_players") if (prefix == "list_players")
emit playerListReceived(playerlist); emit playerListReceived(playerlist);
@ -163,11 +174,6 @@ void Client::readLine()
emit zoneListReceived(cmdid, zonelist); emit zoneListReceived(cmdid, zonelist);
else if (prefix == "dump_zone") else if (prefix == "dump_zone")
emit zoneDumpReceived(cmdid, zonedump); emit zoneDumpReceived(cmdid, zonedump);
else if (prefix == "welcome") {
emit welcomeMsgReceived(welcomemsg);
setStatus(StatusLoggingIn);
login(playerName, password);
}
msgbuf.clear(); msgbuf.clear();
} else } else
msgbuf << values; msgbuf << values;
@ -263,16 +269,16 @@ PendingCommand *Client::listPlayers()
return cmd("list_players"); return cmd("list_players");
} }
PendingCommand *Client::createGame(const QString &description, const QString &password, unsigned int maxPlayers) PendingCommand *Client::createGame(const QString &description, const QString &password, unsigned int maxPlayers, bool spectatorsAllowed)
{ {
PendingCommand *pc = cmd(QString("create_game|%1|%2|%3").arg(description).arg(password).arg(maxPlayers)); PendingCommand *pc = cmd(QString("create_game|%1|%2|%3|%4").arg(description).arg(password).arg(maxPlayers).arg(spectatorsAllowed ? 1 : 0));
connect(pc, SIGNAL(finished(ServerResponse)), this, SLOT(enterGameResponse(ServerResponse))); connect(pc, SIGNAL(finished(ServerResponse)), this, SLOT(enterGameResponse(ServerResponse)));
return pc; return pc;
} }
PendingCommand *Client::joinGame(int gameId, const QString &password) PendingCommand *Client::joinGame(int gameId, const QString &password, bool spectator)
{ {
PendingCommand *pc = cmd(QString("join_game|%1|%2").arg(gameId).arg(password)); PendingCommand *pc = cmd(QString("join_game|%1|%2|%3").arg(gameId).arg(password).arg(spectator ? 1 : 0));
connect(pc, SIGNAL(finished(ServerResponse)), this, SLOT(enterGameResponse(ServerResponse))); connect(pc, SIGNAL(finished(ServerResponse)), this, SLOT(enterGameResponse(ServerResponse)));
return pc; return pc;
} }

8
cockatrice/src/client.h
View file

@ -52,7 +52,7 @@ class Client : public QObject {
Q_OBJECT Q_OBJECT
signals: signals:
void statusChanged(ProtocolStatus _status); void statusChanged(ProtocolStatus _status);
void welcomeMsgReceived(QStringList welcomeMsg); void welcomeMsgReceived(QString welcomeMsg);
void gameListEvent(ServerGame *game); void gameListEvent(ServerGame *game);
void playerListReceived(QList<ServerPlayer *> players); void playerListReceived(QList<ServerPlayer *> players);
void zoneListReceived(int commandId, QList<ServerZone *> zones); void zoneListReceived(int commandId, QList<ServerZone *> zones);
@ -64,6 +64,7 @@ signals:
void serverTimeout(); void serverTimeout();
void logSocketError(const QString &errorString); void logSocketError(const QString &errorString);
void serverError(ServerResponse resp); void serverError(ServerResponse resp);
void protocolVersionMismatch();
private slots: private slots:
void slotConnected(); void slotConnected();
void readLine(); void readLine();
@ -75,6 +76,7 @@ private slots:
void enterGameResponse(ServerResponse response); void enterGameResponse(ServerResponse response);
void leaveGameResponse(ServerResponse response); void leaveGameResponse(ServerResponse response);
private: private:
static const int protocolVersion = 1;
QTimer *timer; QTimer *timer;
QList<PendingCommand *> PendingCommands; QList<PendingCommand *> PendingCommands;
QTcpSocket *socket; QTcpSocket *socket;
@ -100,8 +102,8 @@ public slots:
PendingCommand *chatSay(const QString &name, const QString &s); PendingCommand *chatSay(const QString &name, const QString &s);
PendingCommand *listGames(); PendingCommand *listGames();
PendingCommand *listPlayers(); PendingCommand *listPlayers();
PendingCommand *createGame(const QString &description, const QString &password, unsigned int maxPlayers); PendingCommand *createGame(const QString &description, const QString &password, unsigned int maxPlayers, bool spectatorsAllowed);
PendingCommand *joinGame(int gameId, const QString &password); PendingCommand *joinGame(int gameId, const QString &password, bool spectator);
PendingCommand *leaveGame(); PendingCommand *leaveGame();
PendingCommand *login(const QString &name, const QString &pass); PendingCommand *login(const QString &name, const QString &pass);
PendingCommand *say(const QString &s); PendingCommand *say(const QString &s);

6
cockatrice/src/dlg_creategame.cpp
View file

@ -15,6 +15,9 @@ DlgCreateGame::DlgCreateGame(Client *_client, QWidget *parent)
maxPlayersLabel = new QLabel(tr("P&layers:")); maxPlayersLabel = new QLabel(tr("P&layers:"));
maxPlayersEdit = new QLineEdit("2"); maxPlayersEdit = new QLineEdit("2");
maxPlayersLabel->setBuddy(maxPlayersEdit); maxPlayersLabel->setBuddy(maxPlayersEdit);
spectatorsAllowedCheckBox = new QCheckBox(tr("&Spectators allowed"));
spectatorsAllowedCheckBox->setChecked(true);
QGridLayout *grid = new QGridLayout; QGridLayout *grid = new QGridLayout;
grid->addWidget(descriptionLabel, 0, 0); grid->addWidget(descriptionLabel, 0, 0);
@ -23,6 +26,7 @@ DlgCreateGame::DlgCreateGame(Client *_client, QWidget *parent)
grid->addWidget(passwordEdit, 1, 1); grid->addWidget(passwordEdit, 1, 1);
grid->addWidget(maxPlayersLabel, 2, 0); grid->addWidget(maxPlayersLabel, 2, 0);
grid->addWidget(maxPlayersEdit, 2, 1); grid->addWidget(maxPlayersEdit, 2, 1);
grid->addWidget(spectatorsAllowedCheckBox, 3, 0, 1, 2);
okButton = new QPushButton(tr("&OK")); okButton = new QPushButton(tr("&OK"));
okButton->setDefault(true); okButton->setDefault(true);
@ -54,7 +58,7 @@ void DlgCreateGame::actOK()
QMessageBox::critical(this, tr("Error"), tr("Invalid number of players.")); QMessageBox::critical(this, tr("Error"), tr("Invalid number of players."));
return; return;
} }
PendingCommand *createCommand = client->createGame(descriptionEdit->text(), passwordEdit->text(), maxPlayers); PendingCommand *createCommand = client->createGame(descriptionEdit->text(), passwordEdit->text(), maxPlayers, spectatorsAllowedCheckBox->isChecked());
connect(createCommand, SIGNAL(finished(ServerResponse)), this, SLOT(checkResponse(ServerResponse))); connect(createCommand, SIGNAL(finished(ServerResponse)), this, SLOT(checkResponse(ServerResponse)));
okButton->setEnabled(false); okButton->setEnabled(false);
cancelButton->setEnabled(false); cancelButton->setEnabled(false);

2
cockatrice/src/dlg_creategame.h
View file

@ -7,6 +7,7 @@
class QLabel; class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
class QCheckBox;
class DlgCreateGame : public QDialog { class DlgCreateGame : public QDialog {
Q_OBJECT Q_OBJECT
@ -20,6 +21,7 @@ private:
QLabel *descriptionLabel, *passwordLabel, *maxPlayersLabel; QLabel *descriptionLabel, *passwordLabel, *maxPlayersLabel;
QLineEdit *descriptionEdit, *passwordEdit, *maxPlayersEdit; QLineEdit *descriptionEdit, *passwordEdit, *maxPlayersEdit;
QCheckBox *spectatorsAllowedCheckBox;
QPushButton *okButton, *cancelButton; QPushButton *okButton, *cancelButton;
}; };

10
cockatrice/src/gameselector.cpp
View file

@ -11,10 +11,12 @@ GameSelector::GameSelector(Client *_client, QWidget *parent)
createButton = new QPushButton; createButton = new QPushButton;
joinButton = new QPushButton; joinButton = new QPushButton;
spectateButton = new QPushButton;
QHBoxLayout *buttonLayout = new QHBoxLayout; QHBoxLayout *buttonLayout = new QHBoxLayout;
buttonLayout->addStretch(); buttonLayout->addStretch();
buttonLayout->addWidget(createButton); buttonLayout->addWidget(createButton);
buttonLayout->addWidget(joinButton); buttonLayout->addWidget(joinButton);
buttonLayout->addWidget(spectateButton);
QVBoxLayout *mainLayout = new QVBoxLayout; QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(gameListView); mainLayout->addWidget(gameListView);
@ -28,6 +30,7 @@ GameSelector::GameSelector(Client *_client, QWidget *parent)
connect(createButton, SIGNAL(clicked()), this, SLOT(actCreate())); connect(createButton, SIGNAL(clicked()), this, SLOT(actCreate()));
connect(joinButton, SIGNAL(clicked()), this, SLOT(actJoin())); connect(joinButton, SIGNAL(clicked()), this, SLOT(actJoin()));
connect(spectateButton, SIGNAL(clicked()), this, SLOT(actJoin()));
} }
void GameSelector::actCreate() void GameSelector::actCreate()
@ -46,6 +49,7 @@ void GameSelector::checkResponse(ServerResponse response)
{ {
createButton->setEnabled(true); createButton->setEnabled(true);
joinButton->setEnabled(true); joinButton->setEnabled(true);
spectateButton->setEnabled(true);
if (response == RespOk) if (response == RespOk)
disableGameList(); disableGameList();
@ -57,6 +61,8 @@ void GameSelector::checkResponse(ServerResponse 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;
@ -69,10 +75,11 @@ void GameSelector::actJoin()
return; return;
} }
PendingCommand *joinCommand = client->joinGame(game->getGameId(), password); PendingCommand *joinCommand = client->joinGame(game->getGameId(), password, spectator);
connect(joinCommand, SIGNAL(finished(ServerResponse)), this, SLOT(checkResponse(ServerResponse))); connect(joinCommand, SIGNAL(finished(ServerResponse)), this, SLOT(checkResponse(ServerResponse)));
createButton->setEnabled(false); createButton->setEnabled(false);
joinButton->setEnabled(false); joinButton->setEnabled(false);
spectateButton->setEnabled(false);
} }
void GameSelector::enableGameList() void GameSelector::enableGameList()
@ -99,4 +106,5 @@ void GameSelector::retranslateUi()
{ {
createButton->setText(tr("C&reate")); createButton->setText(tr("C&reate"));
joinButton->setText(tr("&Join")); joinButton->setText(tr("&Join"));
spectateButton->setText(tr("J&oin as spectator"));
} }

2
cockatrice/src/gameselector.h
View file

@ -26,7 +26,7 @@ private:
QTreeView *gameListView; QTreeView *gameListView;
GamesModel *gameListModel; GamesModel *gameListModel;
QPushButton *createButton, *joinButton; QPushButton *createButton, *joinButton, *spectateButton;
}; };
#endif #endif

13
cockatrice/src/messagelogwidget.cpp
View file

@ -17,13 +17,9 @@ void MessageLogWidget::logConnecting(QString hostname)
append(tr("Connecting to %1...").arg(sanitizeHtml(hostname))); append(tr("Connecting to %1...").arg(sanitizeHtml(hostname)));
} }
void MessageLogWidget::logConnected(const QStringList WelcomeMsg) void MessageLogWidget::logConnected(QString welcomeMsg)
{ {
append(tr("Connected.")); append(tr("Connected: %1").arg(welcomeMsg));
QStringListIterator i(WelcomeMsg);
while (i.hasNext())
append(i.next());
} }
void MessageLogWidget::logDisconnected() void MessageLogWidget::logDisconnected()
@ -44,6 +40,11 @@ void MessageLogWidget::logServerError(ServerResponse response)
} }
} }
void MessageLogWidget::logProtocolVersionMismatch()
{
append(tr("Protocol version mismatch."));
}
void MessageLogWidget::logPlayerListReceived(QStringList players) void MessageLogWidget::logPlayerListReceived(QStringList players)
{ {
append("---"); append("---");

3
cockatrice/src/messagelogwidget.h
View file

@ -17,10 +17,11 @@ private:
QString trZoneName(CardZone *zone, Player *player, bool hisOwn, GrammaticalCase gc) const; QString trZoneName(CardZone *zone, Player *player, bool hisOwn, GrammaticalCase gc) const;
public slots: public slots:
void logConnecting(QString hostname); void logConnecting(QString hostname);
void logConnected(const QStringList WelcomeMsg); void logConnected(QString welcomeMsg);
void logDisconnected(); void logDisconnected();
void logSocketError(const QString &errorString); void logSocketError(const QString &errorString);
void logServerError(ServerResponse response); void logServerError(ServerResponse response);
void logProtocolVersionMismatch();
private slots: private slots:
void logPlayerListReceived(QStringList players); void logPlayerListReceived(QStringList players);
void logJoin(Player *player); void logJoin(Player *player);

8
cockatrice/src/servergame.h
View file

@ -9,15 +9,19 @@ private:
bool hasPassword; bool hasPassword;
unsigned char playerCount; unsigned char playerCount;
unsigned char maxPlayers; unsigned char maxPlayers;
bool spectatorsAllowed;
unsigned int spectatorsCount;
public: public:
ServerGame(int _gameId, const QString &_creator, const QString &_description, bool _hasPassword, unsigned char _playerCount, unsigned char _maxPlayers) ServerGame(int _gameId, const QString &_creator, const QString &_description, bool _hasPassword, unsigned char _playerCount, unsigned char _maxPlayers, bool _spectatorsAllowed, unsigned int _spectatorsCount)
: gameId(_gameId), creator(_creator), description(_description), hasPassword(_hasPassword), playerCount(_playerCount), maxPlayers(_maxPlayers) { } : gameId(_gameId), creator(_creator), description(_description), hasPassword(_hasPassword), playerCount(_playerCount), maxPlayers(_maxPlayers), spectatorsAllowed(_spectatorsAllowed), spectatorsCount(_spectatorsCount) { }
int getGameId() const { return gameId; } int getGameId() const { return gameId; }
QString getCreator() const { return creator; } QString getCreator() const { return creator; }
QString getDescription() const { return description; } QString getDescription() const { return description; }
bool getHasPassword() const { return hasPassword; } bool getHasPassword() const { return hasPassword; }
unsigned char getPlayerCount() const { return playerCount; } unsigned char getPlayerCount() const { return playerCount; }
unsigned char getMaxPlayers() const { return maxPlayers; } unsigned char getMaxPlayers() const { return maxPlayers; }
bool getSpectatorsAllowed() const { return spectatorsAllowed; }
unsigned int getSpectatorsCount() const { return spectatorsCount; }
}; };
#endif #endif

3
cockatrice/src/window_main.cpp
View file

@ -326,10 +326,11 @@ MainWindow::MainWindow(QTranslator *_translator, QWidget *parent)
connect(client, SIGNAL(playerIdReceived(int, QString)), this, SLOT(playerIdReceived(int, QString))); connect(client, SIGNAL(playerIdReceived(int, QString)), this, SLOT(playerIdReceived(int, QString)));
connect(this, SIGNAL(logConnecting(QString)), messageLog, SLOT(logConnecting(QString))); connect(this, SIGNAL(logConnecting(QString)), messageLog, SLOT(logConnecting(QString)));
connect(client, SIGNAL(welcomeMsgReceived(const QStringList)), messageLog, SLOT(logConnected(const QStringList))); connect(client, SIGNAL(welcomeMsgReceived(QString)), messageLog, SLOT(logConnected(QString)));
connect(this, SIGNAL(logDisconnected()), messageLog, SLOT(logDisconnected())); connect(this, SIGNAL(logDisconnected()), messageLog, SLOT(logDisconnected()));
connect(client, SIGNAL(logSocketError(const QString &)), messageLog, SLOT(logSocketError(const QString &))); connect(client, SIGNAL(logSocketError(const QString &)), messageLog, SLOT(logSocketError(const QString &)));
connect(client, SIGNAL(serverError(ServerResponse)), messageLog, SLOT(logServerError(ServerResponse))); connect(client, SIGNAL(serverError(ServerResponse)), messageLog, SLOT(logServerError(ServerResponse)));
connect(client, SIGNAL(protocolVersionMismatch()), messageLog, SLOT(logProtocolVersionMismatch()));
connect(phasesToolbar, SIGNAL(signalSetPhase(int)), client, SLOT(setActivePhase(int))); connect(phasesToolbar, SIGNAL(signalSetPhase(int)), client, SLOT(setActivePhase(int)));
connect(phasesToolbar, SIGNAL(signalNextTurn()), client, SLOT(nextTurn())); connect(phasesToolbar, SIGNAL(signalNextTurn()), client, SLOT(nextTurn()));
connect(phasesToolbar, SIGNAL(signalDrawCard()), client, SLOT(drawCard())); connect(phasesToolbar, SIGNAL(signalDrawCard()), client, SLOT(drawCard()));

1
servatrice/src/server.cpp
View file

@ -100,7 +100,6 @@ void Server::incomingConnection(int socketId)
ServerSocket *socket = new ServerSocket(this); ServerSocket *socket = new ServerSocket(this);
socket->setSocketDescriptor(socketId); socket->setSocketDescriptor(socketId);
connect(socket, SIGNAL(createGame(const QString, const QString, int, bool, ServerSocket *)), this, SLOT(addGame(const QString, const QString, int, bool, ServerSocket *))); connect(socket, SIGNAL(createGame(const QString, const QString, int, bool, ServerSocket *)), this, SLOT(addGame(const QString, const QString, int, bool, ServerSocket *)));
connect(socket, SIGNAL(joinGame(int, bool, ServerSocket *)), this, SLOT(addClientToGame(int, bool, ServerSocket *)));
socket->initConnection(); socket->initConnection();
players << socket; players << socket;
} }

3
servatrice/src/serversocket.cpp
View file

@ -822,8 +822,7 @@ void ServerSocket::msg(const QString &s)
void ServerSocket::initConnection() void ServerSocket::initConnection()
{ {
msg(QString("welcome||%1").arg(VERSION_STRING)); msg(QString("welcome|%1|%2").arg(PROTOCOL_VERSION).arg(VERSION_STRING));
msg("welcome||.");
} }
void ServerSocket::catchSocketError(QAbstractSocket::SocketError socketError) void ServerSocket::catchSocketError(QAbstractSocket::SocketError socketError)

3
servatrice/src/version.h
View file

@ -18,4 +18,5 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
const char *VERSION_STRING = "Servatrice 0.20090828"; int PROTOCOL_VERSION = 1;
const char *VERSION_STRING = "Servatrice 0.20090915";