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

Merge pull request #717 from officialronode/master

Browse Source 
Fixed Cash Shop NPC
* Follow up 11f42f27ab4b9eb54c6b12e95b4ff8ec077fa157
* Fixed #931. Failing to buy item from NPC cashshop if no item in item_cash_db
This commit is contained in:
Cydh Ramdh 2016-01-27 13:31:55 +07:00
commit 39d918f70c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/clif.c
View File

@ -15688,12 +15688,13 @@ void clif_parse_cashshop_buy(int fd, struct map_session_data *sd) {
info = &packet_db[sd->packet_ver][cmd]; info = &packet_db[sd->packet_ver][cmd];
if( sd->state.trading || !sd->npc_shopid || !cash_shop_defined) { if( sd->state.trading || !sd->npc_shopid ) {
clif_cashshop_ack(sd,1); clif_cashshop_ack(sd,1);
return; return;
} else { }
else {
#if PACKETVER < 20101116 #if PACKETVER < 20101116
unsigned short nameid = RFIFOW(fd,info->pos[0]); short nameid = RFIFOW(fd,info->pos[0]);
short amount = RFIFOW(fd,info->pos[1]); short amount = RFIFOW(fd,info->pos[1]);
int points = RFIFOL(fd,info->pos[2]); int points = RFIFOL(fd,info->pos[2]);
@ -15720,7 +15721,6 @@ void clif_parse_cashshop_buy(int fd, struct map_session_data *sd) {
#endif #endif
} }
} }
/// Adoption System /// Adoption System
/// ///