mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 22:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various Cleanups (game L-M)

Browse source
This commit is contained in:
Schmoozerd 2012-07-19 21:46:40 +02:00
parent 2bd41afb3e
commit 8d0c106aa4
29 changed files with 2201 additions and 2163 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/game/Level0.cpp
View file

@ -33,7 +33,7 @@
bool ChatHandler::HandleHelpCommand(char* args)
{
if(!*args)
if (!*args)
{
ShowHelpForCommand(getCommandTable(), "help");
ShowHelpForCommand(getCommandTable(), "");
@ -66,16 +66,16 @@ bool ChatHandler::HandleAccountCommand(char* args)
bool ChatHandler::HandleStartCommand(char* /*args*/)
{
Player *chr = m_session->GetPlayer();
Player* chr = m_session->GetPlayer();
if(chr->IsTaxiFlying())
if (chr->IsTaxiFlying())
{
SendSysMessage(LANG_YOU_IN_FLIGHT);
SetSentErrorMessage(true);
return false;
}
if(chr->isInCombat())
if (chr->isInCombat())
{
SendSysMessage(LANG_YOU_IN_COMBAT);
SetSentErrorMessage(true);
@ -96,7 +96,7 @@ bool ChatHandler::HandleServerInfoCommand(char* /*args*/)
std::string str = secsToTimeString(sWorld.GetUptime());
char const* full;
if(m_session)
if (m_session)
full = _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,"|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r");
else
full = _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID);
@ -124,14 +124,14 @@ bool ChatHandler::HandleServerInfoCommand(char* /*args*/)
bool ChatHandler::HandleDismountCommand(char* /*args*/)
{
//If player is not mounted, so go out :)
if (!m_session->GetPlayer( )->IsMounted())
if (!m_session->GetPlayer()->IsMounted())
{
SendSysMessage(LANG_CHAR_NON_MOUNTED);
SetSentErrorMessage(true);
return false;
}
if(m_session->GetPlayer( )->IsTaxiFlying())
if (m_session->GetPlayer()->IsTaxiFlying())
{
SendSysMessage(LANG_YOU_IN_FLIGHT);
SetSentErrorMessage(true);
@ -145,10 +145,10 @@ bool ChatHandler::HandleDismountCommand(char* /*args*/)
bool ChatHandler::HandleSaveCommand(char* /*args*/)
{
Player *player=m_session->GetPlayer();
Player* player=m_session->GetPlayer();
// save GM account without delay and output message (testing, etc)
if(GetAccessLevel() > SEC_PLAYER)
if (GetAccessLevel() > SEC_PLAYER)
{
player->SaveToDB();
SendSysMessage(LANG_PLAYER_SAVED);
@ -169,12 +169,12 @@ bool ChatHandler::HandleGMListIngameCommand(char* /*args*/)
{
HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType &m = sObjectAccessor.GetPlayers();
HashMapHolder<Player>::MapType& m = sObjectAccessor.GetPlayers();
for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
{
AccountTypes itr_sec = itr->second->GetSession()->GetSecurity();
if ((itr->second->isGameMaster() || (itr_sec > SEC_PLAYER && itr_sec <= (AccountTypes)sWorld.getConfig(CONFIG_UINT32_GM_LEVEL_IN_GM_LIST))) &&
(!m_session || itr->second->IsVisibleGloballyFor(m_session->GetPlayer())))
(!m_session || itr->second->IsVisibleGloballyFor(m_session->GetPlayer())))
names.push_back(std::make_pair<std::string, bool>(GetNameLink(itr->second), itr->second->isAcceptWhispers()));
}
}
@ -185,7 +185,7 @@ bool ChatHandler::HandleGMListIngameCommand(char* /*args*/)
char const* accepts = GetMangosString(LANG_GM_ACCEPTS_WHISPER);
char const* not_accept = GetMangosString(LANG_GM_NO_WHISPER);
for(std::list<std::pair< std::string, bool> >::const_iterator iter = names.begin(); iter != names.end(); ++iter)
for (std::list<std::pair< std::string, bool> >::const_iterator iter = names.begin(); iter != names.end(); ++iter)
PSendSysMessage("%s - %s", iter->first.c_str(), iter->second ? accepts : not_accept);
}
else
@ -199,15 +199,15 @@ bool ChatHandler::HandleAccountPasswordCommand(char* args)
// allow use from RA, but not from console (not have associated account id)
if (!GetAccountId())
{
SendSysMessage (LANG_RA_ONLY_COMMAND);
SetSentErrorMessage (true);
SendSysMessage(LANG_RA_ONLY_COMMAND);
SetSentErrorMessage(true);
return false;
}
// allow or quoted string with possible spaces or literal without spaces
char *old_pass = ExtractQuotedOrLiteralArg(&args);
char *new_pass = ExtractQuotedOrLiteralArg(&args);
char *new_pass_c = ExtractQuotedOrLiteralArg(&args);
char* old_pass = ExtractQuotedOrLiteralArg(&args);
char* new_pass = ExtractQuotedOrLiteralArg(&args);
char* new_pass_c = ExtractQuotedOrLiteralArg(&args);
if (!old_pass || !new_pass || !new_pass_c)
return false;
@ -218,21 +218,21 @@ bool ChatHandler::HandleAccountPasswordCommand(char* args)
if (password_new != password_new_c)
{
SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH);
SetSentErrorMessage (true);
SendSysMessage(LANG_NEW_PASSWORDS_NOT_MATCH);
SetSentErrorMessage(true);
return false;
}
if (!sAccountMgr.CheckPassword (GetAccountId(), password_old))
if (!sAccountMgr.CheckPassword(GetAccountId(), password_old))
{
SendSysMessage (LANG_COMMAND_WRONGOLDPASSWORD);
SetSentErrorMessage (true);
SendSysMessage(LANG_COMMAND_WRONGOLDPASSWORD);
SetSentErrorMessage(true);
return false;
}
AccountOpResult result = sAccountMgr.ChangePassword(GetAccountId(), password_new);
switch(result)
switch (result)
{
case AOR_OK:
SendSysMessage(LANG_COMMAND_PASSWORD);
@ -259,8 +259,8 @@ bool ChatHandler::HandleAccountLockCommand(char* args)
// allow use from RA, but not from console (not have associated account id)
if (!GetAccountId())
{
SendSysMessage (LANG_RA_ONLY_COMMAND);
SetSentErrorMessage (true);
SendSysMessage(LANG_RA_ONLY_COMMAND);
SetSentErrorMessage(true);
return false;
}
@ -274,12 +274,12 @@ bool ChatHandler::HandleAccountLockCommand(char* args)
if (value)
{
LoginDatabase.PExecute( "UPDATE account SET locked = '1' WHERE id = '%u'", GetAccountId());
LoginDatabase.PExecute("UPDATE account SET locked = '1' WHERE id = '%u'", GetAccountId());
PSendSysMessage(LANG_COMMAND_ACCLOCKLOCKED);
}
else
{
LoginDatabase.PExecute( "UPDATE account SET locked = '0' WHERE id = '%u'", GetAccountId());
LoginDatabase.PExecute("UPDATE account SET locked = '0' WHERE id = '%u'", GetAccountId());
PSendSysMessage(LANG_COMMAND_ACCLOCKUNLOCKED);
}