From 6a71c68fd365d0b7e91fe89a2d02296ef465a720 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 21 Feb 2006 13:53:36 +0000 Subject: - Vending is now cancelled on a pc_setpos - Pressure again ignores Basilica. - Fixed attacker's sc being nulled when the target's sc is empty. - Slaves now do a battle_check_target to check if the new target is an enemy when acquired through sd->skilltarget. - Fixed SC_SKE halving defense2 twice. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5355 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index b8bea9740..6f015c0b9 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3189,6 +3189,8 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in chat_leavechat(sd); if(sd->trade_partner) // 取引を中?する trade_tradecancel(sd); + if(sd->vender_id) + vending_closevending(sd); if(sd->state.storage_flag == 1) storage_storage_quit(sd,0); // 倉庫を開いてるなら保存する else if (sd->state.storage_flag == 2) -- cgit v1.2.3-70-g09d2