diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-17 07:35:04 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-17 07:35:04 +0000 |
| commit | e5502df6fd36e307cc50b7b6871d0aedb4606397 (patch) | |
| tree | e12b84724778f4e55db32d52c4b1b95d90c006e4 | |
| parent | 2d0e1821a42fcff2fa9122be88b2dd5dcdf848e1 (diff) | |
| download | hercules-e5502df6fd36e307cc50b7b6871d0aedb4606397.tar.gz hercules-e5502df6fd36e307cc50b7b6871d0aedb4606397.tar.bz2 hercules-e5502df6fd36e307cc50b7b6871d0aedb4606397.tar.xz hercules-e5502df6fd36e307cc50b7b6871d0aedb4606397.zip | |
- 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
| -rw-r--r-- | doc/script_commands.txt | 8 | ||||
| -rw-r--r-- | src/map/pet.c | 6 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
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); |