From 7032044f54ac44bab604e700ea1f76066432a2f4 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sun, 17 Mar 2013 01:33:28 -0300 Subject: Follow up 3b89a135dcde9779bd0537cd136a7c34cfadbe3f Dropping the not-used setting from the previous implementation. http://hercules.ws/board/topic/272-re-introducing-console-input/ Signed-off-by: shennetsind --- conf/char-server.conf | 5 ----- conf/login-server.conf | 5 ----- conf/map-server.conf | 5 ----- src/char/char.c | 8 -------- src/login/login.c | 7 ------- src/login/login.h | 1 - src/map/map.c | 12 +----------- 7 files changed, 1 insertion(+), 42 deletions(-) diff --git a/conf/char-server.conf b/conf/char-server.conf index c573a5339..1c166f309 100644 --- a/conf/char-server.conf +++ b/conf/char-server.conf @@ -61,11 +61,6 @@ stdout_with_ansisequence: no //Example: "console_silent: 7" Hides information, status and notice messages (1+2+4) console_silent: 0 -// Console Commands -// Allow for console commands to be used on/off -// This prevents usage of >& log.file -console: off - // Type of server. // No functional side effects at the moment. // Displayed next to the server name in the client. diff --git a/conf/login-server.conf b/conf/login-server.conf index 3e5bdb3f9..8f2fa1bf1 100644 --- a/conf/login-server.conf +++ b/conf/login-server.conf @@ -35,11 +35,6 @@ stdout_with_ansisequence: no //Example: "console_silent: 7" Hides information, status and notice messages (1+2+4) console_silent: 0 -// Console Commands -// Allow for console commands to be used on/off -// This prevents usage of >& log.file -console: off - // Can you use _M/_F to make new accounts on the server? new_account: yes diff --git a/conf/map-server.conf b/conf/map-server.conf index 0fc34d8b9..b251e69ec 100644 --- a/conf/map-server.conf +++ b/conf/map-server.conf @@ -76,11 +76,6 @@ enable_spy: no // as referenced by grf-files.txt rather than from the mapcache? use_grf: no -// Console Commands -// Allow for console commands to be used on/off -// This prevents usage of >& log.file -console: off - // Database autosave time // All characters are saved on this time in seconds (example: // autosave of 60 secs with 60 characters online -> one char is saved every diff --git a/src/char/char.c b/src/char/char.c index 260f7a5cf..a059d08ea 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -148,8 +148,6 @@ unsigned int save_flag = 0; // Initial position (it's possible to set it in conf file) struct point start_point = { 0, 53, 111 }; -int console = 0; - //----------------------------------------------------- // Auth database //----------------------------------------------------- @@ -4721,8 +4719,6 @@ int char_config_read(const char* cfgName) char_del_delay = atoi(w2); } else if(strcmpi(w1,"db_path")==0) { safestrncpy(db_path, w2, sizeof(db_path)); - } else if (strcmpi(w1, "console") == 0) { - console = config_switch(w2); } else if (strcmpi(w1, "fame_list_alchemist") == 0) { fame_list_size_chemist = atoi(w2); if (fame_list_size_chemist > MAX_FAME_LIST) { @@ -4876,10 +4872,6 @@ int do_init(int argc, char **argv) add_timer_func_list(online_data_cleanup, "online_data_cleanup"); add_timer_interval(gettick() + 1000, online_data_cleanup, 0, 0, 600 * 1000); - if( console ) { - //##TODO invoke a CONSOLE_START plugin event - } - //Cleaning the tables for NULL entrys @ startup [Sirius] //Chardb clean if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '0'", char_db) ) diff --git a/src/login/login.c b/src/login/login.c index 51bc7f29c..712fa0e31 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -1602,7 +1602,6 @@ void login_set_defaults() login_config.ip_sync_interval = 0; login_config.log_login = true; safestrncpy(login_config.date_format, "%Y-%m-%d %H:%M:%S", sizeof(login_config.date_format)); - login_config.console = false; login_config.new_account_flag = true; login_config.new_acc_length_limit = true; login_config.use_md5_passwds = false; @@ -1682,8 +1681,6 @@ int login_config_read(const char* cfgName) login_config.min_group_id_to_connect = atoi(w2); else if(!strcmpi(w1, "date_format")) safestrncpy(login_config.date_format, w2, sizeof(login_config.date_format)); - else if(!strcmpi(w1, "console")) - login_config.console = (bool)config_switch(w2); else if(!strcmpi(w1, "allowed_regs")) //account flood protection system allowed_regs = atoi(w2); else if(!strcmpi(w1, "time_allowed")) @@ -1910,10 +1907,6 @@ int do_init(int argc, char** argv) } } - if( login_config.console ) { - //##TODO invoke a CONSOLE_START plugin event - } - // server port open & binding if( (login_fd = make_listen_bind(login_config.login_ip,login_config.login_port)) == -1 ) { ShowFatalError("Failed to bind to port '"CL_WHITE"%d"CL_RESET"'\n",login_config.login_port); diff --git a/src/login/login.h b/src/login/login.h index 7ed556628..3cfea8bdc 100644 --- a/src/login/login.h +++ b/src/login/login.h @@ -68,7 +68,6 @@ struct Login_Config { unsigned int ip_sync_interval; // interval (in minutes) to execute a DNS/IP update (for dynamic IPs) bool log_login; // whether to log login server actions or not char date_format[32]; // date format used in messages - bool console; // console input system enabled? bool new_account_flag,new_acc_length_limit; // autoregistration via _M/_F ? / if yes minimum length is 4? int start_limited_time; // new account expiration time (-1: unlimited) bool use_md5_passwds; // work with password hashes instead of plaintext passwords? diff --git a/src/map/map.c b/src/map/map.c index dbe3937e8..bd0d97ece 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -157,7 +157,6 @@ char charhelp_txt[256] = "conf/charhelp.txt"; char wisp_server_name[NAME_LENGTH] = "Server"; // can be modified in char-server configuration file -int console = 0; int enable_spy = 0; //To enable/disable @spy commands, which consume too much cpu time when sending packets. [Skotlex] int enable_grf = 0; //To enable/disable reading maps from GRF files, bypassing mapcache [blackhole89] @@ -3328,11 +3327,7 @@ int map_config_read(char *cfgName) strcpy(charhelp_txt, w2); else if(strcmpi(w1,"db_path") == 0) safestrncpy(db_path,w2,255); - else if (strcmpi(w1, "console") == 0) { - console = config_switch(w2); - if (console) - ShowNotice("Console Commands are enabled.\n"); - } else if (strcmpi(w1, "enable_spy") == 0) + else if (strcmpi(w1, "enable_spy") == 0) enable_spy = config_switch(w2); else if (strcmpi(w1, "use_grf") == 0) enable_grf = config_switch(w2); @@ -3980,11 +3975,6 @@ int do_init(int argc, char *argv[]) npc_event_do_oninit(); // Init npcs (OnInit) - if( console ) - { - //##TODO invoke a CONSOLE_START plugin event - } - if (battle_config.pk_mode) ShowNotice("Server is running on '"CL_WHITE"PK Mode"CL_RESET"'.\n"); -- cgit v1.2.3-60-g2f50