- Added 'font' config in atcommand_athena.conf (bugreport:3123)

- Changed some defaults in src to match defaults in config.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13865 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 17 insertions, 14 deletions

diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index 8b503baf9..78b78343b 100644
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -144,6 +144,9 @@ homstats: 1,1
 // Kill Steal Protection
 noks: 1,1
 
+// Set Font
+font: 1,1
+
 //---------------------------
 // 10: Super player+ commands
 
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index a7334130f..54e826913 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8891,23 +8891,23 @@ AtCommandInfo atcommand_info[] = {
 	{ "homshuffle",        60,60,     atcommand_homshuffle },
 	{ "showmobs",          10,10,     atcommand_showmobs },
 	{ "feelreset",         10,10,     atcommand_feelreset },
-	{ "auction",           60,60,     atcommand_auction },
+	{ "auction",            1,1,      atcommand_auction },
 	{ "mail",               1,1,      atcommand_mail },
-	{ "noks",               0,0,      atcommand_ksprotection },
-	{ "allowks",            6,6,      atcommand_allowks },
+	{ "noks",               1,1,      atcommand_ksprotection },
+	{ "allowks",           40,40,     atcommand_allowks },
 	{ "cash",              60,60,     atcommand_cash },
 	{ "points",            60,60,     atcommand_cash },
-	{ "agitstart2",         60,60,    atcommand_agitstart2 },
-	{ "agitend2",           60,60,    atcommand_agitend2 },
-	{ "skreset",            60,60,    atcommand_resetskill },
-	{ "streset",            60,60,    atcommand_resetstat },
-	{ "storagelist",        40,40,    atcommand_storagelist },
-	{ "cartlist",           40,40,    atcommand_cart_list },
-	{ "itemlist",           40,40,    atcommand_itemlist },
-	{ "stats",              40,40,    atcommand_stats },
-	{ "delitem",            60,60,    atcommand_delitem },
-	{ "charcommands",        1,1,     atcommand_commands },
-	{ "font",               1,1,     atcommand_font },
+	{ "agitstart2",        60,60,     atcommand_agitstart2 },
+	{ "agitend2",          60,60,     atcommand_agitend2 },
+	{ "skreset",           60,60,     atcommand_resetskill },
+	{ "streset",           60,60,     atcommand_resetstat },
+	{ "storagelist",       40,40,     atcommand_storagelist },
+	{ "cartlist",          40,40,     atcommand_cart_list },
+	{ "itemlist",          40,40,     atcommand_itemlist },
+	{ "stats",             40,40,     atcommand_stats },
+	{ "delitem",           60,60,     atcommand_delitem },
+	{ "charcommands",       1,1,      atcommand_commands },
+	{ "font",               1,1,      atcommand_font },
 };