diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-07 19:48:27 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-07 19:48:27 +0000 |
commit | 2e0c70dfafbbe3f4469e7f1f7c9604cc7d94e455 (patch) | |
tree | 21a3fe5de801b10f729c16293212c346ff437bb8 /src | |
parent | 2f18bd89583f2315dd0e77f2c44dce5737cf000e (diff) | |
download | hercules-2e0c70dfafbbe3f4469e7f1f7c9604cc7d94e455.tar.gz hercules-2e0c70dfafbbe3f4469e7f1f7c9604cc7d94e455.tar.bz2 hercules-2e0c70dfafbbe3f4469e7f1f7c9604cc7d94e455.tar.xz hercules-2e0c70dfafbbe3f4469e7f1f7c9604cc7d94e455.zip |
- Hopefully fixed the party_even_share cast-overflow bug as reported by Adobe.
- Standarized the autosave interval setting to be always in seconds regardless of type.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8172 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r-- | src/map/map.c | 5 | ||||
-rw-r--r-- | src/map/party.c | 2 |
2 files changed, 2 insertions, 5 deletions
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);
|