Merge pull request #62 from mekolat/gm-atcommand

remove @gm atcommand

4 files changed, 0 insertions, 209 deletions

diff --git a/src/char/char.cpp b/src/char/char.cpp
index a9b6834..ed9e369 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -1223,28 +1223,6 @@ void parse_tologin(Session *ls)
                 break;
             }
 
-            case 0x2721:       // gm reply
-            {
-                Packet_Fixed<0x2721> fixed;
-                rv = recv_fpacket<0x2721, 10>(ls, fixed);
-                if (rv != RecvResult::Complete)
-                    break;
-
-                {
-                    AccountId acc = fixed.account_id;
-                    GmLevel gml = fixed.gm_level;
-
-                    Packet_Fixed<0x2b0b> fixed_2b;
-                    fixed_2b.account_id = acc;
-                    fixed_2b.gm_level = gml;
-                    for (Session *ss : iter_map_sessions())
-                    {
-                        send_fpacket<0x2b0b, 10>(ss, fixed_2b);
-                    }
-                }
-                break;
-            }
-
             case 0x2723:       // changesex reply (modified by [Yor])
             {
                 Packet_Fixed<0x2723> fixed;
@@ -1857,33 +1835,6 @@ void parse_frommap(Session *ms)
                 break;
             }
 
-                // it is a request to become GM
-            case 0x2b0a:
-            {
-                Packet_Head<0x2b0a> head;
-                AString repeat;
-                rv = recv_vpacket<0x2b0a, 8, 1>(ms, head, repeat);
-                if (rv != RecvResult::Complete)
-                    break;
-
-                AccountId account_id = head.account_id;
-                if (login_session)
-                {               // don't send request if no login-server
-                    Packet_Head<0x2720> head_20;
-                    head_20.account_id = account_id;
-                    AString& repeat_20 = repeat;
-                    send_vpacket<0x2720, 8, 1>(login_session, head_20, repeat_20);
-                }
-                else
-                {
-                    Packet_Fixed<0x2b0b> fixed_0b;
-                    fixed_0b.account_id = account_id;
-                    fixed_0b.gm_level = GmLevel();
-                    send_fpacket<0x2b0b, 10>(ms, fixed_0b);
-                }
-                break;
-            }
-
                 // Map server send information to change an email of an account -> login-server
             case 0x2b0c:
             {
diff --git a/src/login/login.cpp b/src/login/login.cpp
index 66b3ea0..92f8cc0 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -982,93 +982,6 @@ void parse_fromchar(Session *s)
                 break;
             }
 
-            case 0x2720:       // To become GM request
-            {
-                Packet_Head<0x2720> head;
-                AString repeat;
-                rv = recv_vpacket<0x2720, 8, 1>(s, head, repeat);
-                if (rv != RecvResult::Complete)
-                    break;
-
-                {
-                    AccountId acc = head.account_id;
-
-                    Packet_Fixed<0x2721> fixed_21;
-                    fixed_21.account_id = acc;
-                    fixed_21.gm_level = GmLevel();
-
-                    AString pass = repeat;
-
-                    if (pass == login_conf.gm_pass)
-                    {
-                        // only non-GM can become GM
-                        if (!isGM(acc))
-                        {
-                            // if we autorise creation
-                            if (login_conf.level_new_gm)
-                            {
-                                // if we can open the file to add the new GM
-                                io::AppendFile fp(login_conf.gm_account_filename);
-                                if (fp.is_open())
-                                {
-                                    timestamp_seconds_buffer tmpstr;
-                                    stamp_time(tmpstr);
-                                    FPRINTF(fp,
-                                            "\n// %s: @GM command on account %d\n%d %d\n"_fmt,
-                                            tmpstr,
-                                            acc, acc, login_conf.level_new_gm);
-                                    if (!fp.close())
-                                    {
-                                        PRINTF("warning: didn't actually save GM file\n"_fmt);
-                                    }
-                                    fixed_21.gm_level = login_conf.level_new_gm;
-                                    read_gm_account();
-                                    send_GM_accounts();
-                                    PRINTF("GM Change of the account %d: level 0 -> %d.\n"_fmt,
-                                            acc, login_conf.level_new_gm);
-                                    LOGIN_LOG("Char-server '%s': GM Change of the account %d: level 0 -> %d (ip: %s).\n"_fmt,
-                                            server[id].name, acc,
-                                            login_conf.level_new_gm, ip);
-                                }
-                                else
-                                {
-                                    PRINTF("Error of GM change (suggested account: %d, correct password, unable to add a GM account in GM accounts file)\n"_fmt,
-                                            acc);
-                                    LOGIN_LOG("Char-server '%s': Error of GM change (suggested account: %d, correct password, unable to add a GM account in GM accounts file, ip: %s).\n"_fmt,
-                                            server[id].name, acc, ip);
-                                }
-                            }
-                            else
-                            {
-                                PRINTF("Error of GM change (suggested account: %d, correct password, but GM creation is disable (level_new_gm = 0))\n"_fmt,
-                                        acc);
-                                LOGIN_LOG("Char-server '%s': Error of GM change (suggested account: %d, correct password, but GM creation is disable (level_new_gm = 0), ip: %s).\n"_fmt,
-                                        server[id].name, acc, ip);
-                            }
-                        }
-                        else
-                        {
-                            PRINTF("Error of GM change (suggested account: %d (already GM), correct password).\n"_fmt,
-                                    acc);
-                            LOGIN_LOG("Char-server '%s': Error of GM change (suggested account: %d (already GM), correct password, ip: %s).\n"_fmt,
-                                    server[id].name, acc, ip);
-                        }
-                    }
-                    else
-                    {
-                        PRINTF("Error of GM change (suggested account: %d, invalid password).\n"_fmt,
-                                acc);
-                        LOGIN_LOG("Char-server '%s': Error of GM change (suggested account: %d, invalid password, ip: %s).\n"_fmt,
-                                server[id].name, acc, ip);
-                    }
-                    for (Session *ss : iter_char_sessions())
-                    {
-                        send_fpacket<0x2721, 10>(ss, fixed_21);
-                    }
-                }
-                break;
-            }
-
                 // Map server send information to change an email of an account via char-server
             case 0x2722:       // 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B
             {
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;