summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/script_commands.txt8
-rw-r--r--src/map/pet.c6
-rw-r--r--src/map/script.c2
3 files changed, 9 insertions, 7 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index d022991a6..03c139a17 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -7233,10 +7233,10 @@ state can be:
Other value may cause client crashes.
color can be:
- 0 = yellow
- 1 = orange
- 2 = green
- 3 = blue
+ 0 = yellow "Quest"
+ 1 = orange "Job"
+ 2 = green "Event"
+ 3 = an MVP flag
other values show a transparent mark in the mini-map.
----------------------------------------
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);