- Removed support for negative autosave intervals, instead added a minsave_interval setting which specifies which is the minimum time between character saves. Default to 100ms (map_athena.conf).

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

3 files changed, 12 insertions, 11 deletions

diff --git a/src/map/map.c b/src/map/map.c
index 93508d966..70dc79cac 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -169,6 +169,7 @@ int map_num = 0;
 int map_port=0;
 
 int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
+int minsave_interval = 100;
 int save_settings = 0xFFFF;
 int charsave_method = 0; //Default 'OLD' Save method (SQL ONLY!) [Sirius]
 int agit_flag = 0;
@@ -3314,9 +3315,14 @@ int map_config_read(char *cfgName) {
 				npc_delsrcfile(w2);
 			} else if (strcmpi(w1, "autosave_time") == 0) {
 				autosave_interval = atoi(w2);
-				if (!autosave_interval) //Revert to default saving.
+				if (autosave_interval < 1) //Revert to default saving.
 					autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
-				autosave_interval *= 1000; //Pass from sec to ms
+				else
+					autosave_interval *= 1000; //Pass from sec to ms
+			} else if (strcmpi(w1, "minsave_time") == 0) {
+				minsave_interval= atoi(w2);
+				if (minsave_interval < 1)
+					minsave_interval = 1;
 			} else if (strcmpi(w1, "save_settings") == 0) {
 				save_settings = atoi(w2);
 			} else if (strcmpi(w1, "motd_txt") == 0) {
diff --git a/src/map/map.h b/src/map/map.h
index 5ba672cd7..37a0b9c54 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1246,6 +1246,7 @@ struct chat_data {
 extern struct map_data map[];

 extern int map_num;

 extern int autosave_interval;

+extern int minsave_interval;

 extern int save_settings;

 extern int agit_flag;

 extern int night_flag; // 0=day, 1=night [Yor]

diff --git a/src/map/pc.c b/src/map/pc.c
index 59d65aa0d..cb03378e3 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7175,12 +7175,9 @@ int pc_autosave(int tid,unsigned int tick,int id,int data)
 		save_flag = 1; //Noone was saved, so save first found char.
 	map_foreachpc(pc_autosave_sub);
 
-	if (autosave_interval < 0)
-		return 0; //Fixed interval for saving. [Skotlex]
-
 	interval = autosave_interval/(clif_countusers()+1);
-	if(interval <= 0)
-		interval = 1;
+	if(interval < minsave_interval)
+		interval = minsave_interval;
 	add_timer(gettick()+interval,pc_autosave,0,0);
 
 	return 0;
@@ -7594,10 +7591,7 @@ int do_init_pc(void) {
 	natural_heal_prev_tick = gettick();
 	add_timer_interval(natural_heal_prev_tick + NATURAL_HEAL_INTERVAL, pc_natural_heal, 0, 0, NATURAL_HEAL_INTERVAL);
 
-	if (autosave_interval > 0) //Normal saving.
-		add_timer(gettick() + autosave_interval, pc_autosave, 0, 0);
-	else //Constant save interval.
-		add_timer_interval(gettick() -autosave_interval, pc_autosave, 0, 0, -autosave_interval);
+	add_timer(gettick() + autosave_interval, pc_autosave, 0, 0);
 
 	if (battle_config.day_duration > 0 && battle_config.night_duration > 0) {
 		int day_duration = battle_config.day_duration;