From f14d12d7d3cb9655f9f173a6c4310c96e143b37e Mon Sep 17 00:00:00 2001 From: shennetsind Date: Fri, 9 Dec 2011 02:25:26 +0000 Subject: [PATCH] @command log bug fix, bugreport:4010 git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15036 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/atcommand.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 0304788a8c..c0a8345938 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -9216,6 +9216,13 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message return false; } + //Log atcommands + if( log_config.gm && info->level >= log_config.gm && *atcmd_msg == atcommand_symbol ) + log_atcommand(sd, atcmd_msg); + //Log Charcommands + else if( log_config.gm && info->level2 >= log_config.gm && *atcmd_msg == charcommand_symbol && ssd != NULL ) + log_atcommand(sd, message); + //Attempt to use the command if( strcmpi("adjgmlvl",command+1) && ssd ) { lv = ssd->gmlevel; ssd->gmlevel = sd->gmlevel; } if ( (info->func(fd, (*atcmd_msg == atcommand_symbol) ? sd : ssd, command, params) != 0) ) @@ -9225,14 +9232,6 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message } if( strcmpi("adjgmlvl",command+1) && ssd ) ssd->gmlevel = lv; - //Log atcommands - if( log_config.gm && info->level >= log_config.gm && *atcmd_msg == atcommand_symbol ) - log_atcommand(sd, atcmd_msg); - - //Log Charcommands - if( log_config.gm && info->level2 >= log_config.gm && *atcmd_msg == charcommand_symbol && ssd != NULL ) - log_atcommand(sd, message); - return true; }