diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-26 15:02:31 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-26 15:02:31 +0000 |
| commit | a25b1a1f0fb28d4262cdbf22bcc7727b576a876a (patch) | |
| tree | 6769a1dd3a1d8196f10c98267c18d6530d83e81a | |
| parent | 7f2a12250794e5897f39acfa7314db7f926bdf12 (diff) | |
| download | hercules-a25b1a1f0fb28d4262cdbf22bcc7727b576a876a.tar.gz hercules-a25b1a1f0fb28d4262cdbf22bcc7727b576a876a.tar.bz2 hercules-a25b1a1f0fb28d4262cdbf22bcc7727b576a876a.tar.xz hercules-a25b1a1f0fb28d4262cdbf22bcc7727b576a876a.zip | |
* Fixed opening other player's vending terminating currently running NPC conversation. Vending is now unavailable when talking to an NPC (bugreport:2208).
* Fixed vending not accepting 0 Zeny as sell price. The client asks for confirmation when you attempt to sell items at 0 Zeny (bugreport:2595, since r918 and r11344).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14628 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 7 | ||||
| -rw-r--r-- | src/map/vending.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 08138bf1f..9ad319bfb 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,8 @@ Date Added 2010/12/26 + * Fixed opening other player's vending terminating currently running NPC conversation. Vending is now unavailable when talking to an NPC (bugreport:2208). [Ai4rei] + * Fixed vending not accepting 0 Zeny as sell price. The client asks for confirmation when you attempt to sell items at 0 Zeny (bugreport:2595, since r918 and r11344). * Fixed items, that get dropped at 100% chance, being reported in @iteminfo as 'available in the shops only' (since/replaces r3482). [Ai4rei] * Updated commands @delitem/#delitem. [Ai4rei] - No longer deletes stackable items one by one (bugreport:1914). diff --git a/src/map/clif.c b/src/map/clif.c index 14b7aa16e..c5796555a 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10872,10 +10872,11 @@ void clif_parse_CloseVending(int fd, struct map_session_data* sd) *------------------------------------------*/ void clif_parse_VendingListReq(int fd, struct map_session_data* sd) { - vending_vendinglistreq(sd,RFIFOL(fd,2)); - if( sd->npc_id ) - npc_event_dequeue(sd); + {// using an NPC + return; + } + vending_vendinglistreq(sd,RFIFOL(fd,2)); } /*========================================== diff --git a/src/map/vending.c b/src/map/vending.c index 67e5ebf19..90bff7399 100644 --- a/src/map/vending.c +++ b/src/map/vending.c @@ -275,7 +275,7 @@ void vending_openvending(struct map_session_data* sd, const char* message, bool sd->vending[i].index = index; sd->vending[i].amount = amount; - sd->vending[i].value = cap_value(value, 1, (unsigned int)battle_config.vending_max_value); + sd->vending[i].value = cap_value(value, 0, (unsigned int)battle_config.vending_max_value); i++; // item successfully added } |