merged from master

This commit is contained in:
Max-Wilhelm Bruker
2012-03-31 18:41:01 +02:00
5 changed files with 2182 additions and 2373 deletions
+1 -1
View File
@@ -97,7 +97,7 @@ public:
bool containsUser(const QString &userName) const;
void addPlayer(Server_AbstractUserInterface *userInterface, ResponseContainer &rc, bool spectator, bool broadcastUpdate = true);
void removePlayer(Server_Player *player);
void removeArrowsToPlayer(GameEventStorage &ges, Server_Player *player);
void removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Player *player);
void unattachCards(GameEventStorage &ges, Server_Player *player);
bool kickPlayer(int playerId);
void startGameIfReady();