Merge pull request #200 from arxanas/4x-cardname

Fix #184: Deck loader reads 4x cardname correctly.

common/server_counter.cpp

@@ -12,9 +12,9 @@ Server_Counter::Server_Counter(int _id, const QString &_name, const color &_coun
 
 void Server_Counter::getInfo(ServerInfo_Counter *info)
 {
-	info->set_id(id);
-	info->set_name(name.toStdString());
-	info->mutable_counter_color()->CopyFrom(counterColor);
-	info->set_radius(radius);
-	info->set_count(count);
+    info->set_id(id);
+    info->set_name(name.toStdString());
+    info->mutable_counter_color()->CopyFrom(counterColor);
+    info->set_radius(radius);
+    info->set_count(count);
 }

common/server_counter.h

@@ -27,22 +27,22 @@ class ServerInfo_Counter;
 
 class Server_Counter {
 protected:
-	int id;
-	QString name;
-	color counterColor;
-	int radius;
-	int count;
+    int id;
+    QString name;
+    color counterColor;
+    int radius;
+    int count;
 public:
-	Server_Counter(int _id, const QString &_name, const color &_counterColor, int _radius, int _count = 0);
-	~Server_Counter() { }
-	int getId() const { return id; }
-	QString getName() const { return name; }
-	const color &getColor() const { return counterColor; }
-	int getRadius() const { return radius; }
-	int getCount() const { return count; }
-	void setCount(int _count) { count = _count; }
-	
-	void getInfo(ServerInfo_Counter *info);
+    Server_Counter(int _id, const QString &_name, const color &_counterColor, int _radius, int _count = 0);
+    ~Server_Counter() { }
+    int getId() const { return id; }
+    QString getName() const { return name; }
+    const color &getColor() const { return counterColor; }
+    int getRadius() const { return radius; }
+    int getCount() const { return count; }
+    void setCount(int _count) { count = _count; }
+    
+    void getInfo(ServerInfo_Counter *info);
 };
 
 #endif

common/server_database_interface.h

@@ -6,32 +6,32 @@
 #include "server.h"
 
 class Server_DatabaseInterface : public QObject {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	Server_DatabaseInterface(QObject *parent = 0)
-		: QObject(parent) { }
-	
-	virtual AuthenticationResult checkUserPassword(Server_ProtocolHandler *handler, const QString &user, const QString &password, QString &reasonStr, int &secondsLeft) = 0;
-	virtual bool userExists(const QString &user) { return false; }
-	virtual QMap<QString, ServerInfo_User> getBuddyList(const QString &name) { return QMap<QString, ServerInfo_User>(); }
-	virtual QMap<QString, ServerInfo_User> getIgnoreList(const QString &name) { return QMap<QString, ServerInfo_User>(); }
-	virtual bool isInBuddyList(const QString &whoseList, const QString &who) { return false; }
-	virtual bool isInIgnoreList(const QString &whoseList, const QString &who) { return false; }
-	virtual ServerInfo_User getUserData(const QString &name, bool withId = false) = 0;
-	virtual void storeGameInformation(const QString &roomName, const QStringList &roomGameTypes, const ServerInfo_Game &gameInfo, const QSet<QString> &allPlayersEver, const QSet<QString> &allSpectatorsEver, const QList<GameReplay *> &replayList) { }
-	virtual DeckList *getDeckFromDatabase(int deckId, int userId) { return 0; }
-	
-	virtual qint64 startSession(const QString &userName, const QString &address) { return 0; }
+    Server_DatabaseInterface(QObject *parent = 0)
+        : QObject(parent) { }
+    
+    virtual AuthenticationResult checkUserPassword(Server_ProtocolHandler *handler, const QString &user, const QString &password, QString &reasonStr, int &secondsLeft) = 0;
+    virtual bool userExists(const QString &user) { return false; }
+    virtual QMap<QString, ServerInfo_User> getBuddyList(const QString &name) { return QMap<QString, ServerInfo_User>(); }
+    virtual QMap<QString, ServerInfo_User> getIgnoreList(const QString &name) { return QMap<QString, ServerInfo_User>(); }
+    virtual bool isInBuddyList(const QString &whoseList, const QString &who) { return false; }
+    virtual bool isInIgnoreList(const QString &whoseList, const QString &who) { return false; }
+    virtual ServerInfo_User getUserData(const QString &name, bool withId = false) = 0;
+    virtual void storeGameInformation(const QString &roomName, const QStringList &roomGameTypes, const ServerInfo_Game &gameInfo, const QSet<QString> &allPlayersEver, const QSet<QString> &allSpectatorsEver, const QList<GameReplay *> &replayList) { }
+    virtual DeckList *getDeckFromDatabase(int deckId, int userId) { return 0; }
+    
+    virtual qint64 startSession(const QString &userName, const QString &address) { return 0; }
 public slots:
-	virtual void endSession(qint64 sessionId) { }
+    virtual void endSession(qint64 sessionId) { }
 public:
-	virtual int getNextGameId() = 0;
-	virtual int getNextReplayId() = 0;
-	
-	virtual void clearSessionTables() { }
-	virtual void lockSessionTables() { }
-	virtual void unlockSessionTables() { }
-	virtual bool userSessionExists(const QString &userName) { return false; }
+    virtual int getNextGameId() = 0;
+    virtual int getNextReplayId() = 0;
+    
+    virtual void clearSessionTables() { }
+    virtual void lockSessionTables() { }
+    virtual void unlockSessionTables() { }
+    virtual bool userSessionExists(const QString &userName) { return false; }
 };
 
 #endif

common/server_game.h

@@ -42,86 +42,86 @@ class Server_AbstractUserInterface;
 class Event_GameStateChanged;
 
 class Server_Game : public QObject {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	Server_Room *room;
-	int nextPlayerId;
-	int hostId;
-	ServerInfo_User *creatorInfo;
-	QMap<int, Server_Player *> players;
-	QSet<QString> allPlayersEver, allSpectatorsEver;
-	bool gameStarted;
-	bool gameClosed;
-	int gameId;
-	QString description;
-	QString password;
-	int maxPlayers;
-	QList<int> gameTypes;
-	int activePlayer, activePhase;
-	bool onlyBuddies, onlyRegistered;
-	bool spectatorsAllowed;
-	bool spectatorsNeedPassword;
-	bool spectatorsCanTalk;
-	bool spectatorsSeeEverything;
-	int inactivityCounter;
-	int startTimeOfThisGame, secondsElapsed;
-	bool firstGameStarted;
-	QDateTime startTime;
-	QTimer *pingClock;
-	QList<GameReplay *> replayList;
-	GameReplay *currentReplay;
-	
-	void createGameStateChangedEvent(Event_GameStateChanged *event, Server_Player *playerWhosAsking, bool omniscient, bool withUserInfo);
-	void sendGameStateToPlayers();
-	void storeGameInformation();
+    Server_Room *room;
+    int nextPlayerId;
+    int hostId;
+    ServerInfo_User *creatorInfo;
+    QMap<int, Server_Player *> players;
+    QSet<QString> allPlayersEver, allSpectatorsEver;
+    bool gameStarted;
+    bool gameClosed;
+    int gameId;
+    QString description;
+    QString password;
+    int maxPlayers;
+    QList<int> gameTypes;
+    int activePlayer, activePhase;
+    bool onlyBuddies, onlyRegistered;
+    bool spectatorsAllowed;
+    bool spectatorsNeedPassword;
+    bool spectatorsCanTalk;
+    bool spectatorsSeeEverything;
+    int inactivityCounter;
+    int startTimeOfThisGame, secondsElapsed;
+    bool firstGameStarted;
+    QDateTime startTime;
+    QTimer *pingClock;
+    QList<GameReplay *> replayList;
+    GameReplay *currentReplay;
+    
+    void createGameStateChangedEvent(Event_GameStateChanged *event, Server_Player *playerWhosAsking, bool omniscient, bool withUserInfo);
+    void sendGameStateToPlayers();
+    void storeGameInformation();
 signals:
-	void sigStartGameIfReady();
-	void gameInfoChanged(ServerInfo_Game gameInfo);
+    void sigStartGameIfReady();
+    void gameInfoChanged(ServerInfo_Game gameInfo);
 private slots:
-	void pingClockTimeout();
-	void doStartGameIfReady();
+    void pingClockTimeout();
+    void doStartGameIfReady();
 public:
-	mutable QMutex gameMutex;
-	Server_Game(const ServerInfo_User &_creatorInfo, int _gameId, const QString &_description, const QString &_password, int _maxPlayers, const QList<int> &_gameTypes, bool _onlyBuddies, bool _onlyRegistered, bool _spectatorsAllowed, bool _spectatorsNeedPassword, bool _spectatorsCanTalk, bool _spectatorsSeeEverything, Server_Room *parent);
-	~Server_Game();
-	Server_Room *getRoom() const { return room; }
-	void getInfo(ServerInfo_Game &result) const;
-	int getHostId() const { return hostId; }
-	ServerInfo_User *getCreatorInfo() const { return creatorInfo; }
-	bool getGameStarted() const { return gameStarted; }
-	int getPlayerCount() const;
-	int getSpectatorCount() const;
-	const QMap<int, Server_Player *> &getPlayers() const { return players; }
-	int getGameId() const { return gameId; }
-	QString getDescription() const { return description; }
-	QString getPassword() const { return password; }
-	int getMaxPlayers() const { return maxPlayers; }
-	bool getSpectatorsAllowed() const { return spectatorsAllowed; }
-	bool getSpectatorsNeedPassword() const { return spectatorsNeedPassword; }
-	bool getSpectatorsCanTalk() const { return spectatorsCanTalk; }
-	bool getSpectatorsSeeEverything() const { return spectatorsSeeEverything; }
-	Response::ResponseCode checkJoin(ServerInfo_User *user, const QString &_password, bool spectator, bool overrideRestrictions);
-	bool containsUser(const QString &userName) const;
-	void addPlayer(Server_AbstractUserInterface *userInterface, ResponseContainer &rc, bool spectator, bool broadcastUpdate = true);
-	void removePlayer(Server_Player *player);
-	void removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Player *player);
-	void unattachCards(GameEventStorage &ges, Server_Player *player);
-	bool kickPlayer(int playerId);
-	void startGameIfReady();
-	void stopGameIfFinished();
-	int getActivePlayer() const { return activePlayer; }
-	int getActivePhase() const { return activePhase; }
-	void setActivePlayer(int _activePlayer);
-	void setActivePhase(int _activePhase);
-	void nextTurn();
-	int getSecondsElapsed() const { return secondsElapsed; }
+    mutable QMutex gameMutex;
+    Server_Game(const ServerInfo_User &_creatorInfo, int _gameId, const QString &_description, const QString &_password, int _maxPlayers, const QList<int> &_gameTypes, bool _onlyBuddies, bool _onlyRegistered, bool _spectatorsAllowed, bool _spectatorsNeedPassword, bool _spectatorsCanTalk, bool _spectatorsSeeEverything, Server_Room *parent);
+    ~Server_Game();
+    Server_Room *getRoom() const { return room; }
+    void getInfo(ServerInfo_Game &result) const;
+    int getHostId() const { return hostId; }
+    ServerInfo_User *getCreatorInfo() const { return creatorInfo; }
+    bool getGameStarted() const { return gameStarted; }
+    int getPlayerCount() const;
+    int getSpectatorCount() const;
+    const QMap<int, Server_Player *> &getPlayers() const { return players; }
+    int getGameId() const { return gameId; }
+    QString getDescription() const { return description; }
+    QString getPassword() const { return password; }
+    int getMaxPlayers() const { return maxPlayers; }
+    bool getSpectatorsAllowed() const { return spectatorsAllowed; }
+    bool getSpectatorsNeedPassword() const { return spectatorsNeedPassword; }
+    bool getSpectatorsCanTalk() const { return spectatorsCanTalk; }
+    bool getSpectatorsSeeEverything() const { return spectatorsSeeEverything; }
+    Response::ResponseCode checkJoin(ServerInfo_User *user, const QString &_password, bool spectator, bool overrideRestrictions);
+    bool containsUser(const QString &userName) const;
+    void addPlayer(Server_AbstractUserInterface *userInterface, ResponseContainer &rc, bool spectator, bool broadcastUpdate = true);
+    void removePlayer(Server_Player *player);
+    void removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Player *player);
+    void unattachCards(GameEventStorage &ges, Server_Player *player);
+    bool kickPlayer(int playerId);
+    void startGameIfReady();
+    void stopGameIfFinished();
+    int getActivePlayer() const { return activePlayer; }
+    int getActivePhase() const { return activePhase; }
+    void setActivePlayer(int _activePlayer);
+    void setActivePhase(int _activePhase);
+    void nextTurn();
+    int getSecondsElapsed() const { return secondsElapsed; }
 
-	void createGameJoinedEvent(Server_Player *player, ResponseContainer &rc, bool resuming);
-	
-	GameEventContainer *prepareGameEvent(const ::google::protobuf::Message &gameEvent, int playerId, GameEventContext *context = 0);
-	GameEventContext prepareGameEventContext(const ::google::protobuf::Message &gameEventContext);
-	
-	void sendGameEventContainer(GameEventContainer *cont, GameEventStorageItem::EventRecipients recipients = GameEventStorageItem::SendToPrivate | GameEventStorageItem::SendToOthers, int privatePlayerId = -1);
+    void createGameJoinedEvent(Server_Player *player, ResponseContainer &rc, bool resuming);
+    
+    GameEventContainer *prepareGameEvent(const ::google::protobuf::Message &gameEvent, int playerId, GameEventContext *context = 0);
+    GameEventContext prepareGameEventContext(const ::google::protobuf::Message &gameEventContext);
+    
+    void sendGameEventContainer(GameEventContainer *cont, GameEventStorageItem::EventRecipients recipients = GameEventStorageItem::SendToPrivate | GameEventStorageItem::SendToOthers, int privatePlayerId = -1);
 };
 
 #endif