Some fixing on storage saving on map change. derived from ea stable.

2 files changed, 4 insertions, 12 deletions

diff --git a/src/map/map.c b/src/map/map.c
index 3faf492..5cc742d 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -988,11 +988,6 @@ int map_quit(struct map_session_data *sd) {
 
 	pc_cleareventtimer(sd);	// イベントタイマを破棄する
 
-	if(sd->state.storage_flag == 1)
-		storage_storage_quit(sd);	// 倉庫を開いてるなら保存する
-	else if(sd->state.storage_flag == 2)
-		storage_guild_storage_quit(sd,0);
-
 	skill_castcancel(&sd->bl,0);	// 詠唱を中断する
 	skill_stop_dancing(&sd->bl,1);// ダンス/演奏中断
 
@@ -1028,9 +1023,9 @@ int map_quit(struct map_session_data *sd) {
 	if (!sd->state.storage_flag)
 		chrif_save(sd);
 	else if (sd->state.storage_flag == 1)
-		storage_storageclose(sd);
+		storage_storage_quit(sd);
 	else if (sd->state.storage_flag == 2)
-		storage_guild_storageclose(sd);
+		storage_guild_storage_quit(sd,1);
 
 	if( sd->npc_stackbuf && sd->npc_stackbuf != NULL)
 		free( sd->npc_stackbuf );
diff --git a/src/map/pc.c b/src/map/pc.c
index 2a36438..630a15b 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3489,12 +3489,9 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt
 				if (!sd->state.storage_flag)
 					chrif_save(sd);
 				else if (sd->state.storage_flag == 1)
-				{
-					storage_storageclose(sd);
-					storage_delete(sd->status.account_id);
-				}
+					storage_storage_quit(sd);
 				else if (sd->state.storage_flag == 2)
-					storage_guild_storageclose(sd);
+					storage_guild_storage_quit(sd,1);
 
 				chrif_changemapserver(sd, mapname, x, y, ip, port);
 				return 0;