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

fixed issue #66: game creators can't kick spectators; unfortunately, this fix is client-side

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-07-17 19:06:12 +02:00
parent a1e35ccda5
commit 28b18575f2
3 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/tab_game.cpp
View file

@ -819,17 +819,6 @@ AbstractClient *TabGame::getClientForPlayer(int playerId) const
return clients.first(); return clients.first();
} }
int TabGame::getPlayerIdByName(const QString &playerName) const
{
QMapIterator<int, Player *> playerIterator(players);
while (playerIterator.hasNext()) {
const Player *const p = playerIterator.next().value();
if (p->getName() == playerName)
return p->getId();
}
return -1;
}
void TabGame::sendGameCommand(PendingCommand *pend, int playerId) void TabGame::sendGameCommand(PendingCommand *pend, int playerId)
{ {
AbstractClient *client = getClientForPlayer(playerId); AbstractClient *client = getClientForPlayer(playerId);

1
cockatrice/src/tab_game.h
View file

@ -210,7 +210,6 @@ public:
bool getSpectatorsSeeEverything() const { return gameInfo.spectators_omniscient(); } bool getSpectatorsSeeEverything() const { return gameInfo.spectators_omniscient(); }
Player *getActiveLocalPlayer() const; Player *getActiveLocalPlayer() const;
AbstractClient *getClientForPlayer(int playerId) const; AbstractClient *getClientForPlayer(int playerId) const;
int getPlayerIdByName(const QString &playerName) const;
void setActiveCard(CardItem *_card) { activeCard = _card; } void setActiveCard(CardItem *_card) { activeCard = _card; }
CardItem *getActiveCard() const { return activeCard; } CardItem *getActiveCard() const { return activeCard; }

2
cockatrice/src/user_context_menu.cpp
View file

@ -182,7 +182,7 @@ void UserContextMenu::showContextMenu(const QPoint &pos, const QString &userName
client->sendCommand(client->prepareSessionCommand(cmd)); client->sendCommand(client->prepareSessionCommand(cmd));
} else if (actionClicked == aKick) { } else if (actionClicked == aKick) {
Command_KickFromGame cmd; Command_KickFromGame cmd;
cmd.set_player_id(game->getPlayerIdByName(userName)); cmd.set_player_id(playerId);
game->sendGameCommand(cmd); game->sendGameCommand(cmd);
} else if (actionClicked == aBan) { } else if (actionClicked == aBan) {
Command_GetUserInfo cmd; Command_GetUserInfo cmd;