summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-27 18:43:31 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-27 18:43:31 +0000
commitfd625485b8ab08aa9df7115d630076cb2ca6d9af (patch)
tree48bbfa255756163d6943a21968726bf309d354a7 /src/map/unit.c
parentbf8bae03ea42ffb8684beb999ca1101e5f11fb48 (diff)
downloadhercules-fd625485b8ab08aa9df7115d630076cb2ca6d9af.tar.gz
hercules-fd625485b8ab08aa9df7115d630076cb2ca6d9af.tar.bz2
hercules-fd625485b8ab08aa9df7115d630076cb2ca6d9af.tar.xz
hercules-fd625485b8ab08aa9df7115d630076cb2ca6d9af.zip
* Added separate character state for vending (like for buyingstore), instead of vender_id != 0 (follow up to r14682, related r14713).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14762 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 2467baf86..da1ce1c14 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -802,7 +802,7 @@ int unit_can_move(struct block_list *bl)
if (sd && (
pc_issit(sd) ||
- sd->vender_id ||
+ sd->state.vending ||
sd->state.buyingstore ||
sd->state.blockedmove
))
@@ -1871,8 +1871,7 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file,
chat_leavechat(sd,0);
if(sd->trade_partner)
trade_tradecancel(sd);
- if(sd->vender_id)
- vending_closevending(sd);
+ vending_closevending(sd);
buyingstore_close(sd);
searchstore_close(sd);
if(sd->state.storage_flag == 1)