Merge pull request #88 from mekolat/gmpass

remove leftovers from gm atcommand removal

2 files changed, 0 insertions, 27 deletions

diff --git a/src/login/login.cpp b/src/login/login.cpp
index 92f8cc0..886c510 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -2871,18 +2871,6 @@ bool display_conf_warnings(void)
         }
     }
 
-    if (!login_conf.gm_pass)
-    {
-        PRINTF("***WARNING: 'To GM become' password is void (gm_pass).\n"_fmt);
-        PRINTF("            We highly recommend that you set one password.\n"_fmt);
-        rv = false;
-    }
-    else if (login_conf.gm_pass == "gm"_s)
-    {
-        PRINTF("***WARNING: You are using the default GM password (gm_pass).\n"_fmt);
-        PRINTF("            We highly recommend that you change it.\n"_fmt);
-    }
-
     if (login_conf.gm_account_filename_check_timer.count() < 0)
     {
         PRINTF("***WARNING: Invalid value for gm_account_filename_check_timer parameter.\n"_fmt);
@@ -2971,19 +2959,6 @@ void save_config_in_log(void)
             LOGIN_LOG("  %s\n"_fmt, ae);
     }
 
-    if (!login_conf.gm_pass)
-        LOGIN_LOG("- with a VOID 'To GM become' password (gm_pass).\n"_fmt);
-    else if (login_conf.gm_pass == "gm"_s)
-        LOGIN_LOG("- with the DEFAULT 'To GM become' password (gm_pass).\n"_fmt);
-    else
-        LOGIN_LOG("- with a 'To GM become' password (gm_pass) of %zu character(s).\n"_fmt,
-                login_conf.gm_pass.size());
-    if (!login_conf.level_new_gm)
-        LOGIN_LOG("- to refuse any creation of GM with @gm.\n"_fmt);
-    else
-        LOGIN_LOG("- to create GM with level '%d' when @gm is used.\n"_fmt,
-                login_conf.level_new_gm);
-
     if (login_conf.new_account)
         LOGIN_LOG("- to ALLOW new users (with _F/_M).\n"_fmt);
     else
diff --git a/tools/config.py b/tools/config.py
index 583904a..126b40d 100755
--- a/tools/config.py
+++ b/tools/config.py
@@ -504,8 +504,6 @@ def build_config():
     login_conf.opt('admin_state', bool, 'false')
     login_conf.opt('admin_pass', AccountPass, '{}')
     login_conf.opt('ladminallowip', IpSet, '{}')
-    login_conf.opt('gm_pass', RString, '{}')
-    login_conf.opt('level_new_gm', GmLevel, 'GmLevel::from(60_u32)', {udl_h})
     login_conf.opt('new_account', bool, 'false')
     login_conf.opt('login_port', u16, '6901', min='1024')
     login_conf.opt('account_filename', RString, lit('save/account.txt'))