From e5502df6fd36e307cc50b7b6871d0aedb4606397 Mon Sep 17 00:00:00 2001
From: brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 17 Dec 2011 07:35:04 +0000
Subject: - Fixed pet.c not checking log_config.enable_logs setting. [lighta] -
 Updated documentation for 'showevent'.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15152 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/pet.c    | 6 ++++--
 src/map/script.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/map/pet.c b/src/map/pet.c
index a0f652f2b..dba16f881 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1013,8 +1013,10 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd)
 				memcpy(&ditem->item_data, it, sizeof(struct item));
 				ditem->next = dlist->item;
 				dlist->item = ditem;
-			} else
-    			log_pick_pc(sd, "P", it->nameid, it->amount, it);
+			} else {
+				if (log_config.enable_logs & LOG_PLAYER_ITEMS)
+					log_pick_pc(sd, "P", it->nameid, it->amount, it);
+			}
 		}
 		else {
 			ditem = ers_alloc(item_drop_ers, struct item_drop);
diff --git a/src/map/script.c b/src/map/script.c
index cdd8c6542..b21f46a64 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -15080,7 +15080,7 @@ BUILDIN_FUNC(showevent)
 	state = script_getnum(st, 2);
 	color = script_getnum(st, 3);
 
-  if( color < 0 || color > 4 )
+	if( color < 0 || color > 3 )
 	color = 0; // set default color
 
 	clif_quest_show_event(sd, &nd->bl, state, color);
-- 
cgit v1.2.3-70-g09d2