Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrated atcommand aliases and help to YAML (#4487)

Browse Source 
Merges atcommand_athena.conf and help.txt into a single file.
Removed some leftover settings that were removed before.
Removed CLI support for modifying the atcommand configuration file.
Moved atcommand and charcommand symbol definition into conf/battle/gm.conf
Removed some messages that are not needed anymore

Co-authored-by: Aleos <aleos89@users.noreply.github.com>
This commit is contained in:
Lemongrass3110
2019-12-21 19:19:19 +01:00
committed by GitHub
parent b967439fa7
commit 64b5c3082b
21 changed files with 1204 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/map/map.cpp
View File

@@ -160,8 +160,6 @@ struct map_cache_map_info {
};
char motd_txt[256] = "conf/motd.txt";
char help_txt[256] = "conf/help.txt";
char help2_txt[256] = "conf/help2.txt";
char charhelp_txt[256] = "conf/charhelp.txt";
char channel_conf[256] = "conf/channels.conf";
@@ -4076,10 +4074,6 @@ int map_config_read(const char *cfgName)
save_settings = cap_value(atoi(w2),CHARSAVE_NONE,CHARSAVE_ALL);
else if (strcmpi(w1, "motd_txt") == 0)
safestrncpy(motd_txt, w2, sizeof(motd_txt));
else if (strcmpi(w1, "help_txt") == 0)
safestrncpy(help_txt, w2, sizeof(help_txt));
else if (strcmpi(w1, "help2_txt") == 0)
safestrncpy(help2_txt, w2, sizeof(help2_txt));
else if (strcmpi(w1, "charhelp_txt") == 0)
safestrncpy(charhelp_txt, w2, sizeof(charhelp_txt));
else if (strcmpi(w1, "channel_conf") == 0)
@@ -5143,7 +5137,6 @@ int do_init(int argc, char *argv[])
LOG_CONF_NAME="conf/log_athena.conf";
MAP_CONF_NAME = "conf/map_athena.conf";
BATTLE_CONF_FILENAME = "conf/battle_athena.conf";
ATCOMMAND_CONF_FILENAME = "conf/atcommand_athena.conf";
SCRIPT_CONF_NAME = "conf/script_athena.conf";
GRF_PATH_FILENAME = "conf/grf-files.txt";
safestrncpy(console_log_filepath, "./log/map-msg_log.log", sizeof(console_log_filepath));