Changeset 112 for trunk/src/game/Level0.cpp

Timestamp:

11/19/08 13:37:14 (17 years ago)

Author:

yumileroy

Message:

[svn] * Merge CLI Commands with regular commands and give them level4 access. sec_console. Source mangos - thanks to ogeraisi for the amalgamated patch.
* Redid/Fixed/Added some lang strings.
* As usual remember this is a trunk rev so stability only guaranteed on northern countries of Mars and western parts of Pluto. No warranties outside the solar system, sorry :( . Check with your local government or dictator on regulations regarding export.

Original author: KingPin?
Date: 2008-10-26 13:32:42-05:00

Files:

• trunk/src/game/Level0.cpp (modified) (8 diffs)

trunk/src/game/Level0.cpp

@@ -36 +36 @@
 bool ChatHandler::HandleHelpCommand(const char* args)
 {
-    if(!*args)
-        return false;
-
-    char* cmd = strtok((char*)args, " ");
+        char* cmd = strtok((char*)args, " ");
     if(!cmd)
-        return false;
-
-    if(!ShowHelpForCommand(getCommandTable(), cmd))
-        SendSysMessage(LANG_NO_HELP_CMD);
+        {
+                ShowHelpForCommand(getCommandTable(), "help");
+                ShowHelpForCommand(getCommandTable(), "");
+        }
+        else
+        {
+                if(!ShowHelpForCommand(getCommandTable(), cmd))
+                        SendSysMessage(LANG_NO_HELP_CMD);
+        }
 
     return true;
@@ -55 +57 @@
 }
 
-bool ChatHandler::HandleAcctCommand(const char* /*args*/)
+bool ChatHandler::HandleAccountCommand(const char* /*args*/)
 {
     uint32 gmlevel = m_session->GetSecurity();
@@ -142 +144 @@
 }
 
-bool ChatHandler::HandleGMListCommand(const char* /*args*/)
+bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/)
 {
     bool first = true;
@@ -150 +152 @@
     for(; itr != m.end(); ++itr)
     {
-        if( itr->second->GetSession()->GetSecurity() && (itr->second->isGameMaster() || sWorld.getConfig(CONFIG_GM_IN_GM_LIST) ) &&
-            itr->second->IsVisibleGloballyFor(m_session->GetPlayer()) )
+        if (itr->second->GetSession()->GetSecurity() &&
+                        (itr->second->isGameMaster() || sWorld.getConfig(CONFIG_GM_IN_GM_LIST)) &&
+                        (!m_session || itr->second->IsVisibleGloballyFor(m_session->GetPlayer())) )
         {
             if(first)
@@ -178 +181 @@
     char *new_pass_c  = strtok (NULL, " ");
 
-    if( !old_pass || !new_pass || !new_pass_c )
+    if (!old_pass || !new_pass || !new_pass_c)
         return false;
 
@@ -185 +188 @@
     std::string password_new_c = new_pass_c;
 
-    if(!accmgr.CheckPassword(m_session->GetAccountId(), password_old) || password_new != password_new_c)
-    {
-        SendSysMessage(LANG_COMMAND_WRONGOLDPASSWORD);
-        SetSentErrorMessage(true);
+    if (password_new != password_new_c)
+    {
+        SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH);
+                SetSentErrorMessage (true);
+                return false;
+        }
+
+        if (!accmgr.CheckPassword (m_session->GetAccountId(), password_old))
+        {
+                SendSysMessage (LANG_COMMAND_WRONGOLDPASSWORD);
+                SetSentErrorMessage (true);
         return false;
     }
@@ -199 +209 @@
             SendSysMessage(LANG_COMMAND_PASSWORD);
             break;
+                case AOR_PASS_TOO_LONG:
+                        SendSysMessage(LANG_PASSWORD_TOO_LONG);
+                        SetSentErrorMessage(true);
+                        return false;
+                case AOR_NAME_NOT_EXIST:                            // not possible case, don't want get account name for output
         default:
             SendSysMessage(LANG_COMMAND_NOTCHANGEPASSWORD);
@@ -234 +249 @@
     return true;
 }
+
+/// Display the 'Message of the day' for the realm
+bool ChatHandler::HandleServerMotdCommand(const char* /*args*/)
+{
+        PSendSysMessage(LANG_MOTD_CURRENT, sWorld.GetMotd());
+        return true;
+}