- Cleaned up a bit the code for @item

- Fixed character/storage being sent to be saved TWICE when you logged out while the storage is opened.
- Added save_settings map config. Specifies after which events do characters get saved (defaults to all): 1 - Trade successful, 2 - Vending transaction, 4 - Closing storage/guild storage, 8 - hatching a pet.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7375 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 2 deletions

diff --git a/src/map/trade.c b/src/map/trade.c
index 236be38c2..26f2c03b0 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -531,6 +531,9 @@ void trade_tradecommit(struct map_session_data *sd) {
 	clif_tradecompleted(sd, 0);

 	clif_tradecompleted(tsd, 0);

 	// save both player to avoid crash: they always have no advantage/disadvantage between the 2 players

-	chrif_save(sd,0); // do pc_makesavestatus and save storage too

-	chrif_save(tsd,0); // do pc_makesavestatus and save storage too

+	if (save_settings&1)

+  	{

+		chrif_save(sd,0); 

+		chrif_save(tsd,0);

+	}

 }