summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorDennis Friis <peavey@inspircd.org>2009-06-23 01:35:07 +0200
committerDennis Friis <peavey@inspircd.org>2009-06-25 01:13:20 +0200
commit2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c (patch)
tree1f3e5351556519137c137942f78ef92f36bf67f3 /src/map/pc.c
parent85f88cd23756be9be2028e0ca13cf1449e38c858 (diff)
downloadtmwa-2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c.tar.gz
tmwa-2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c.tar.bz2
tmwa-2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c.tar.xz
tmwa-2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c.zip
More fixes to storage derived from ea stable.
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 537e978..2a36438 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3424,10 +3424,10 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt
chat_leavechat(sd);
if(sd->trade_partner) // �����𒆒f����
trade_tradecancel(sd);
- if(sd->state.storage_flag)
- storage_guild_storage_quit(sd,0);
- else
+ if(sd->state.storage_flag == 1)
storage_storage_quit(sd); // �q�ɂ��J���Ă��Ȃ��ۑ�����
+ else if (sd->state.storage_flag == 2)
+ storage_guild_storage_quit(sd,0);
if(sd->party_invite>0) // �p�[�e�B���U��ۂ���
party_reply_invite(sd,sd->party_invite_account,0);
@@ -3495,6 +3495,7 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt
}
else if (sd->state.storage_flag == 2)
storage_guild_storageclose(sd);
+
chrif_changemapserver(sd, mapname, x, y, ip, port);
return 0;
}