summaryrefslogtreecommitdiff
path: root/src/map/trade.c
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-09 09:09:35 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-09 09:09:35 +0000
commit1260d294ed795011b5b73284e308a6a01d9eef9e (patch)
tree6663a0ae44f8ac7d830598311411843401f129a1 /src/map/trade.c
parent28532995686a5315ddf0ad6557ae00cb2fe76206 (diff)
downloadhercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.gz
hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.bz2
hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.xz
hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.zip
* Merged changes from trunk [14742:14782/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/trade.c')
-rw-r--r--src/map/trade.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/trade.c b/src/map/trade.c
index bedbb9451..fb9fecbac 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -138,8 +138,8 @@ void trade_tradeack(struct map_session_data *sd, int type)
}
//Check if you can start trade.
- if (sd->npc_id || sd->vender_id || sd->state.buyingstore || sd->state.storage_flag ||
- tsd->npc_id || tsd->vender_id || tsd->state.buyingstore || tsd->state.storage_flag)
+ if (sd->npc_id || sd->state.vending || sd->state.buyingstore || sd->state.storage_flag ||
+ tsd->npc_id || tsd->state.vending || tsd->state.buyingstore || tsd->state.storage_flag)
{ //Fail
clif_tradestart(sd, 2);
clif_tradestart(tsd, 2);