diff options
author | maximius <none@none> | 2009-09-14 16:50:01 -0700 |
---|---|---|
committer | maximius <none@none> | 2009-09-14 16:50:01 -0700 |
commit | 6cb428318af4aba5ebb9d9340284165ca6181065 (patch) | |
tree | 9aee2db05975f78bf96fc0bbfff47a5fa4fca112 /src/game/Level0.cpp | |
parent | 33f8f5ac2d2b99819ce7e0f4aad4fa0648eba35e (diff) | |
parent | 140ec674a040bdc04086472330a289c2d15ecc65 (diff) |
*Merge..
--HG--
branch : trunk
Diffstat (limited to 'src/game/Level0.cpp')
-rw-r--r-- | src/game/Level0.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp index 2692fdbe953..efc09494d1d 100644 --- a/src/game/Level0.cpp +++ b/src/game/Level0.cpp @@ -149,7 +149,7 @@ bool ChatHandler::HandleSaveCommand(const char* /*args*/) // save or plan save after 20 sec (logout delay) if current next save time more this value and _not_ output any messages to prevent cheat planning uint32 save_interval = sWorld.getConfig(CONFIG_INTERVAL_SAVE); - if (save_interval==0 || (save_interval > 20*IN_MILISECONDS && player->GetSaveTimer() <= save_interval - 20*IN_MILISECONDS)) + if(save_interval==0 || save_interval > 20*IN_MILISECONDS && player->GetSaveTimer() <= save_interval - 20*IN_MILISECONDS) player->SaveToDB(); return true; @@ -164,7 +164,7 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/) for(; itr != m.end(); ++itr) { AccountTypes itr_sec = itr->second->GetSession()->GetSecurity(); - if ((itr->second->isGameMaster() || (itr_sec > SEC_PLAYER && itr_sec <= sWorld.getConfig(CONFIG_GM_LEVEL_IN_GM_LIST))) && + if ((itr->second->isGameMaster() || itr_sec > SEC_PLAYER && itr_sec <= sWorld.getConfig(CONFIG_GM_LEVEL_IN_GM_LIST)) && (!m_session || itr->second->IsVisibleGloballyFor(m_session->GetPlayer()))) { if(first) |