diff options
| author | Spp <none@none> | 2010-08-23 14:10:24 +0200 |
|---|---|---|
| committer | Spp <none@none> | 2010-08-23 14:10:24 +0200 |
| commit | 58e94dcb9d2d983c8ffc2df0bb86f3d765b08652 (patch) | |
| tree | 15d7064e900faf241d117be5bd2567f99ed5287f /src/server/game | |
| parent | 16d95d3115b27536e7a1c99e795a5f90c238eb16 (diff) | |
Core: Fix more warnings
--HG--
branch : trunk
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Server/Protocol/Handlers/MiscHandler.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 2 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSocketMgr.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index acfa809cf57..ea81e649c4d 100644 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -242,7 +242,7 @@ void WorldSession::HandleWhoOpcode(WorldPacket & recv_data) continue; // player can see MODERATOR, GAME MASTER, ADMINISTRATOR only if CONFIG_GM_IN_WHO_LIST - if ((itr->second->GetSession()->GetSecurity() > gmLevelInWhoList)) + if ((itr->second->GetSession()->GetSecurity() > AccountTypes(gmLevelInWhoList))) continue; } @@ -376,7 +376,7 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/) //instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in worldserver.conf if (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) || GetPlayer()->isInFlight() || - GetSecurity() >= sWorld.getConfig(CONFIG_INSTANT_LOGOUT)) + GetSecurity() >= AccountTypes(sWorld.getConfig(CONFIG_INSTANT_LOGOUT))) { WorldPacket data(SMSG_LOGOUT_RESPONSE, 1+4); data << uint8(0); @@ -746,7 +746,7 @@ void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data) return; // prevent resurrect before 30-sec delay after body release not finished - if (corpse->GetGhostTime() + GetPlayer()->GetCorpseReclaimDelay(corpse->GetType() == CORPSE_RESURRECTABLE_PVP) > time(NULL)) + if (corpse->GetGhostTime() + GetPlayer()->GetCorpseReclaimDelay(corpse->GetType() == CORPSE_RESURRECTABLE_PVP) > time_t(time(NULL))) return; if (!corpse->IsWithinDistInMap(GetPlayer(), CORPSE_RECLAIM_RADIUS, true)) diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 75aff32af5d..7535ae0c0dd 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -288,7 +288,7 @@ class WorldSession time_t m_timeOutTime; void UpdateTimeOutTime(uint32 diff) { - if (diff > m_timeOutTime) + if (time_t(diff) > m_timeOutTime) m_timeOutTime = 0; else m_timeOutTime -= diff; diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 99d1407bdd8..d948c65be2f 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -57,9 +57,9 @@ class ReactorRunnable : protected ACE_Task_Base public: ReactorRunnable() : - m_ThreadId(-1), + m_Reactor(0), m_Connections(0), - m_Reactor(0) + m_ThreadId(-1) { ACE_Reactor_Impl* imp = 0; |
