summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--conf-tmpl/map_athena.conf2
-rw-r--r--src/map/map.c5
-rw-r--r--src/map/party.c2
4 files changed, 7 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3ad1008b9..ec7f0a1b8 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/07
+ * Hopefully fixed the party_even_share cast-overflow bug as reported by
+ Adobe. [Skotlex]
+ * Standarized the autosave interval setting to be always in seconds
+ regardless of type. [Skotlex]
* Moved the "bosses can't be knockback" logic from battle_calc_* functions
and placed it on skill_blown. [Skotlex]
* Some parenthesis cleanup before invoking battle_calc_base_damage, could
diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index 18dee1518..a3ee68ceb 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -96,7 +96,7 @@ console: off
// When positive, all characters are saved on this time in seconds (example:
// autosave of 60 secs with 60 characters online -> one char is saved every
// second)
-// When negative, the timeslot is constant, in ms (example: if -1000, a
+// When negative, the timeslot is constant, in seconds (example: if -1, a
// character will be saved once a second, regardless of number of players
// online).
autosave_time: 300
diff --git a/src/map/map.c b/src/map/map.c
index 34a18f033..2428cc6e2 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3313,10 +3313,7 @@ int map_config_read(char *cfgName) {
autosave_interval = atoi(w2);
if (!autosave_interval) //Revert to default saving.
autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
- else if (autosave_interval > 0) //Pass from MS to seconds
- autosave_interval *= 1000;
- else if (autosave_interval > -100) //Use lower cap of 100ms
- autosave_interval = -100;
+ autosave_interval *= 1000; //Pass from sec to ms
} else if (strcmpi(w1, "save_settings") == 0) {
save_settings = atoi(w2);
} else if (strcmpi(w1, "motd_txt") == 0) {
diff --git a/src/map/party.c b/src/map/party.c
index 9ed5e3e0d..650b8b7c2 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -704,7 +704,7 @@ int party_exp_share(struct party_data *p,struct block_list *src,unsigned int bas
{
struct map_session_data* sd[MAX_PARTY];
int i;
- short c, bonus =100; // modified [Valaris]
+ unsigned short c, bonus =100; // modified [Valaris]
nullpo_retr(0, p);