summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-31 15:27:13 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-31 15:27:13 +0000
commit0f4fad15c74141d817cc8505b4c5d95c74e96bf2 (patch)
treee15a76314714788cf6097900e2284260617b8451 /src
parent31514c5d363203bb6596f291d4b2df46c76d0b14 (diff)
downloadhercules-0f4fad15c74141d817cc8505b4c5d95c74e96bf2.tar.gz
hercules-0f4fad15c74141d817cc8505b4c5d95c74e96bf2.tar.bz2
hercules-0f4fad15c74141d817cc8505b4c5d95c74e96bf2.tar.xz
hercules-0f4fad15c74141d817cc8505b4c5d95c74e96bf2.zip
Fixed bugreport:5835 vendings are no longer broken when character moves map or is recalled by a gm.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16181 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/atcommand.c3
-rw-r--r--src/map/clif.c5
-rw-r--r--src/map/unit.c1
3 files changed, 6 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 786c160b2..9c891df2f 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2954,8 +2954,7 @@ ACMD_FUNC(petrename)
/*==========================================
*
*------------------------------------------*/
-ACMD_FUNC(recall)
-{
+ACMD_FUNC(recall) {
struct map_session_data *pl_sd = NULL;
nullpo_retr(-1, sd);
diff --git a/src/map/clif.c b/src/map/clif.c
index b89bce483..34a1fb0eb 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9285,6 +9285,11 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
guild_guildaura_refresh(sd,GD_HAWKEYES,guild_checkskill(sd->state.gmaster_flag,GD_HAWKEYES));
}
+ if( sd->state.vending ) { /* show we have a vending */
+ clif_openvending(sd,sd->bl.id,sd->vending);
+ clif_showvendingboard(&sd->bl,sd->message,0);
+ }
+
if(map[sd->bl.m].flag.loadevent) // Lance
npc_script_event(sd, NPCE_LOADMAP);
diff --git a/src/map/unit.c b/src/map/unit.c
index b881a3469..e58c003e9 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2021,7 +2021,6 @@ 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);
- vending_closevending(sd);
buyingstore_close(sd);
searchstore_close(sd);
if(sd->state.storage_flag == 1)