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

Fixed the Item Shop and Point Shop not displaying their shop message when "callshop" is used. (bugreport:8710)

Browse Source
This commit is contained in:
aleos89 2014-03-18 15:30:22 -04:00
parent e0c8e01e08
commit 26aad11908
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/map/npc.c
View File

@ -1218,25 +1218,10 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd)
switch(nd->subtype) { switch(nd->subtype) {
case SHOP: case SHOP:
case ITEMSHOP:
case POINTSHOP:
clif_npcbuysell(sd,nd->bl.id); clif_npcbuysell(sd,nd->bl.id);
break; break;
case ITEMSHOP:
{
char output[CHAT_SIZE_MAX];
struct item_data *id = itemdb_exists(nd->u.shop.itemshop_nameid);
memset(output,'\0',sizeof(output));
sprintf(output,msg_txt(sd,714),id->jname,id->nameid); // Item Shop List: %s (%d)
clif_broadcast(&sd->bl,output,strlen(output) + 1,0x10,SELF);
clif_npcbuysell(sd,nd->bl.id);
} break;
case POINTSHOP:
{
char output[CHAT_SIZE_MAX];
memset(output,'\0',sizeof(output));
sprintf(output,msg_txt(sd,715),nd->u.shop.pointshop_str); // Point Shop List: '%s'
clif_broadcast(&sd->bl,output,strlen(output) + 1,0x10,SELF);
clif_npcbuysell(sd,nd->bl.id);
} break;
case CASHSHOP: case CASHSHOP:
clif_cashshop_show(sd,nd); clif_cashshop_show(sd,nd);
break; break;
@ -1311,11 +1296,29 @@ int npc_buysellsel(struct map_session_data* sd, int id, int type)
} }
if (nd->sc.option & OPTION_INVISIBLE) // can't buy if npc is not visible (hack?) if (nd->sc.option & OPTION_INVISIBLE) // can't buy if npc is not visible (hack?)
return 1; return 1;
if( nd->class_ < 0 && !sd->state.callshop ) if( nd->class_ < 0 && !sd->state.callshop ) {// not called through a script and is not a visible NPC so an invalid call
{// not called through a script and is not a visible NPC so an invalid call
return 1; return 1;
} }
if (nd->subtype == ITEMSHOP) {
char output[CHAT_SIZE_MAX];
struct item_data *id = itemdb_exists(nd->u.shop.itemshop_nameid);
memset(output,'\0',sizeof(output));
if (id) {
sprintf(output,msg_txt(sd,714),id->jname,id->nameid); // Item Shop List: %s (%d)
clif_broadcast(&sd->bl,output,strlen(output) + 1,0x10,SELF);
}
} else if (nd->subtype == POINTSHOP) {
char output[CHAT_SIZE_MAX];
memset(output,'\0',sizeof(output));
sprintf(output,msg_txt(sd,715),nd->u.shop.pointshop_str); // Point Shop List: '%s'
clif_broadcast(&sd->bl,output,strlen(output) + 1,0x10,SELF);
}
// reset the callshop state for future calls // reset the callshop state for future calls
sd->state.callshop = 0; sd->state.callshop = 0;
sd->npc_shopid = id; sd->npc_shopid = id;