Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed opening other player's vending terminating currently running NPC conversation. Vending is now unavailable when talking to an NPC (bugreport:2208).

Browse Source 
* 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://svn.code.sf.net/p/rathena/svn/trunk@14628 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2010-12-26 15:02:31 +00:00
parent 226fa32b4c
commit 5984718d86
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -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).

7
src/map/clif.c
View File

@ -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));
}
/*==========================================

2
src/map/vending.c
View File

@ -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
}