diff options
| author | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-15 02:09:42 +0000 |
|---|---|---|
| committer | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-15 02:09:42 +0000 |
| commit | 226265a6cdbac588bac232c1dc9e3e9c2074cd56 (patch) | |
| tree | 9f50aa84f762014b5c523ca031ce2e1dafca3860 | |
| parent | e6a622895e290cccc1ad6d18e44b7419c33e6a3d (diff) | |
| download | hercules-226265a6cdbac588bac232c1dc9e3e9c2074cd56.tar.gz hercules-226265a6cdbac588bac232c1dc9e3e9c2074cd56.tar.bz2 hercules-226265a6cdbac588bac232c1dc9e3e9c2074cd56.tar.xz hercules-226265a6cdbac588bac232c1dc9e3e9c2074cd56.zip | |
Follow up to r17013, exit loop if found a warp near the player.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17023 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/npc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index b7435e089..c3af52607 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -932,6 +932,7 @@ int npc_touch_areanpc(struct map_session_data* sd, int m, int x, int y) break; // hidden chars cannot use warps pc_setpos(sd,map[m].npc[j]->u.warp.mapindex,map[m].npc[j]->u.warp.x,map[m].npc[j]->u.warp.y,CLR_OUTSIGHT); found_warp = 1; + break; } } @@ -1424,7 +1425,8 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po if( (double)nd->u.shop.shop_item[i].value * amount > INT_MAX ) { ShowWarning("npc_cashshop_buy: Item '%s' (%d) price overflow attempt!\n", item->name, nameid); - ShowDebug("(NPC:'%s' (%s,%d,%d), player:'%s' (%d/%d), value:%d, amount:%d)\n", nd->exname, map[nd->bl.m].name, nd->bl.x, nd->bl.y, sd->status.name, sd->status.account_id, sd->status.char_id, nd->u.shop.shop_item[i].value, amount); + ShowDebug("(NPC:'%s' (%s,%d,%d), player:'%s' (%d/%d), value:%d, amount:%d)\n", + nd->exname, map[nd->bl.m].name, nd->bl.x, nd->bl.y, sd->status.name, sd->status.account_id, sd->status.char_id, nd->u.shop.shop_item[i].value, amount); return 5; } |