From 68d8ee552a2b39cd0c5b2fc75c1335d221f68010 Mon Sep 17 00:00:00 2001
From: brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 24 Dec 2011 15:02:02 +0000
Subject: * Merged changes up to eAthena 15040 (follow up to r15245, fixed some
 errors).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15248 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/atcommand.c | 19 ++++++-------------
 src/map/npc.c       |  3 +--
 2 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'src/map')

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 8da3fa296..204656285 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9253,12 +9253,13 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message
 	}
 	
 	//Log atcommands
-	if( log_config.gm && info->level >= log_config.gm && *atcmd_msg == atcommand_symbol )
-		log_atcommand(sd, atcmd_msg);	
+	if( *atcmd_msg == atcommand_symbol )
+		log_atcommand(sd, info->level, atcmd_msg);
+		
 	//Log Charcommands
-	else if( log_config.gm && info->level2 >= log_config.gm && *atcmd_msg == charcommand_symbol && ssd != NULL )
-		log_atcommand(sd, message);
-
+	if( *atcmd_msg == charcommand_symbol && ssd != NULL )
+		log_atcommand(sd, info->level2, 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) )
@@ -9268,14 +9269,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( *atcmd_msg == atcommand_symbol )
-		log_atcommand(sd, info->level, atcmd_msg);
-		
-	//Log Charcommands
-	if( *atcmd_msg == charcommand_symbol && ssd != NULL )
-		log_atcommand(sd, info->level2, message);
-	
 	return true;
 }
 
diff --git a/src/map/npc.c b/src/map/npc.c
index 0312bb892..4606cfc8e 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1268,8 +1268,7 @@ int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, uns
             pc_additem(sd,&item_tmp,amount);
         }
 
-        if( log_config.enable_logs & LOG_NPC_TRANSACTIONS )
-            log_pick_pc(sd, "S", nameid, amount, NULL);
+        log_pick_pc(sd, LOG_TYPE_NPC, nameid, amount, NULL);
     }
 
     return 0;
-- 
cgit v1.2.3-70-g09d2