Merge pull request #62 from mekolat/gm-atcommand

remove @gm atcommand

2 files changed, 0 insertions, 73 deletions

diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 9a35d30..cb5e2fb 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -1528,25 +1528,6 @@ ATCE atcommand_joblevelup(Session *s, dumb_ptr<map_session_data> sd,
 }
 
 static
-ATCE atcommand_gm(Session *s, dumb_ptr<map_session_data> sd,
-        ZString message)
-{
-    if (!message)
-        return ATCE::USAGE;
-
-    if (pc_isGM(sd))
-    {
-        // a GM can not use this function. only a normal player (become gm is not for gm!)
-        clif_displaymessage(s, "You already have some GM powers."_s);
-        return ATCE::PERM;
-    }
-    else
-        chrif_changegm(sd->status_key.account_id, message);
-
-    return ATCE::OKAY;
-}
-
-static
 ATCE atcommand_pvpoff(Session *s, dumb_ptr<map_session_data> sd,
         ZString)
 {
@@ -4995,9 +4976,6 @@ Map<XString, AtCommandInfo> atcommand_info =
     {"jlvl"_s, {"<delta>"_s,
         60, atcommand_joblevelup,
         "Adjust your job level"_s}},
-    {"gm"_s, {"<password>"_s,
-        100, atcommand_gm,
-        "Receive GM powers"_s}},
     {"pvpoff"_s, {""_s,
         60, atcommand_pvpoff,
         "Enable PvP on your map"_s}},
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index bf4ae4e..24369ed 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -345,23 +345,6 @@ int chrif_charselectreq(dumb_ptr<map_session_data> sd)
 }
 
 /*==========================================
- * GMに変化要求
- *------------------------------------------
- */
-void chrif_changegm(AccountId id, ZString pass)
-{
-    if (!char_session)
-        return;
-
-    if (battle_config.etc_log)
-        PRINTF("chrif_changegm: account: %d, password: '%s'.\n"_fmt, id, pass);
-
-    Packet_Head<0x2b0a> head_0a;
-    head_0a.account_id = id;
-    send_vpacket<0x2b0a, 8, 1>(char_session, head_0a, pass);
-}
-
-/*==========================================
  * Change Email
  *------------------------------------------
  */
@@ -559,30 +542,6 @@ int chrif_char_ask_name_answer(Session *, const Packet_Fixed<0x2b0f>& fixed)
 }
 
 /*==========================================
- * End of GM change(@GM) (modified by Yor)
- *------------------------------------------
- */
-static
-void chrif_changedgm(Session *, const Packet_Fixed<0x2b0b>& fixed)
-{
-    AccountId acc = fixed.account_id;
-    GmLevel level = fixed.gm_level;
-
-    dumb_ptr<map_session_data> sd = map_id2sd(account_to_block(acc));
-
-    if (battle_config.etc_log)
-        PRINTF("chrif_changedgm: account: %d, GM level 0 -> %d.\n"_fmt, acc,
-                level);
-    if (sd != nullptr)
-    {
-        if (level)
-            clif_displaymessage(sd->sess, "GM modification success."_s);
-        else
-            clif_displaymessage(sd->sess, "Failure of GM modification."_s);
-    }
-}
-
-/*==========================================
  * 性別変化終了 (modified by Yor)
  *------------------------------------------
  */
@@ -973,16 +932,6 @@ void chrif_parse(Session *s)
                 chrif_changemapserverack(s, fixed);
                 break;
             }
-            case 0x2b0b:
-            {
-                Packet_Fixed<0x2b0b> fixed;
-                rv = recv_fpacket<0x2b0b, 10>(s, fixed);
-                if (rv != RecvResult::Complete)
-                    break;
-
-                chrif_changedgm(s, fixed);
-                break;
-            }
             case 0x2b0d:
             {
                 Packet_Fixed<0x2b0d> fixed;