sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some compiler warnings.

Browse Source
This commit is contained in:
lotodore
2010-10-11 15:44:56 +00:00
parent 2c558daf9e
commit 972f678730
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/db/serverdbnoaction.h
+8 -8
View File
@@ -30,19 +30,19 @@ public:
ServerDBNoAction();
virtual ~ServerDBNoAction();
virtual void Init(const std::string &host, const std::string &user, const std::string &pwd,
const std::string &database, const std::string &encryptionKey) {}
virtual void Init(const std::string &/*host*/, const std::string &/*user*/, const std::string &/*pwd*/,
const std::string &/*database*/, const std::string &/*encryptionKey*/) {}
virtual void Start() {}
virtual void Stop() {}
virtual void AsyncPlayerLogin(unsigned requestId, const std::string &playerName) {}
virtual void PlayerPostLogin(DB_id playerId, const std::string &avatarHash, const std::string &avatarType) {}
virtual void PlayerLogout(DB_id playerId) {}
virtual void AsyncPlayerLogin(unsigned /*requestId*/, const std::string &/*playerName*/) {}
virtual void PlayerPostLogin(DB_id /*playerId*/, const std::string &/*avatarHash*/, const std::string &/*avatarType*/) {}
virtual void PlayerLogout(DB_id /*playerId*/) {}
virtual void AsyncCreateGame(unsigned requestId, const std::string &gameName) {}
virtual void SetGamePlayerPlace(DB_id gameId, DB_id playerId, unsigned place) {}
virtual void EndGame(DB_id gameId) {}
virtual void AsyncCreateGame(unsigned /*requestId*/, const std::string &/*gameName*/) {}
virtual void SetGamePlayerPlace(DB_id /*gameId*/, DB_id /*playerId*/, unsigned /*place*/) {}
virtual void EndGame(DB_id /*gameId*/) {}
};
#endif // _SERVERDBNOACTION_H_
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+1 -1
View File
@@ -1434,7 +1434,7 @@ void gameLobbyDialogImpl::showNickListContextMenu(QPoint p)
if(myNickListModel->rowCount() && myNickListSelectionModel->currentIndex().isValid()) {
assert(mySession);
int playerUid = myNickListSelectionModel->currentIndex().data(Qt::UserRole).toUInt();
unsigned playerUid = myNickListSelectionModel->currentIndex().data(Qt::UserRole).toUInt();
if(inGame && mySession->getClientGameInfo(mySession->getClientCurrentGameId()).data.gameType == GAME_TYPE_INVITE_ONLY && playerUid != mySession->getClientUniquePlayerId() && !mySession->getClientPlayerInfo(playerUid).isGuest) {
src/gui/qt/styles/gametablestylereader.cpp
+1 -1
View File
@@ -860,8 +860,8 @@ QString GameTableStyleReader::getActionPic(int action)
return ActionWinnerI18NPic;
}
break;
default: return QString("");
}
return QString("");
}
void GameTableStyleReader::setButtonsStyle(MyActionButton *br, MyActionButton *cc, MyActionButton *f, MyActionButton *a, int state)
src/net/common/servergamestate.cpp
+1 -1
View File
@@ -1357,7 +1357,7 @@ ServerGameStateWaitPlayerAction::TimerTimeout(const boost::system::error_code &e
curPlayer->incrementActionTimeoutCounter();
if (server->GetGameData().gameType == GAME_TYPE_RANKING
&& server->GetGameData().playerActionTimeoutSec >= server->GetSmallDelaySec())
&& server->GetGameData().playerActionTimeoutSec >= (int)server->GetSmallDelaySec())
{
if (curPlayer->getActionTimeoutCounter() == SERVER_WARNING_ACTION_TIMEOUT_THRESHOLD)
{
src/net/common/serverlobbythread.cpp
+1 -1
View File
@@ -1677,7 +1677,7 @@ ServerLobbyThread::TimerUpdateClientLoginLock(const boost::system::error_code &e
{
TimerClientAddressMap::iterator next = i;
++next;
if (i->second.elapsed().total_seconds() > SERVER_INIT_LOGIN_CLIENT_LOCK_SEC)
if (i->second.elapsed().total_seconds() > (int)SERVER_INIT_LOGIN_CLIENT_LOCK_SEC)
m_timerClientAddressMap.erase(i);
i = next;
}