Просмотр исходного кода

- 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://svn.code.sf.net/p/rathena/svn/trunk@8172 54d463be-8e91-2dee-dedb-b68131a5f0ec

skotlex 19 лет назад
Родитель
Сommit
527a7ac223
4 измененных файлов с 7 добавлено и 6 удалено
  1. 4 0
      Changelog-Trunk.txt
  2. 1 1
      conf-tmpl/map_athena.conf
  3. 1 4
      src/map/map.c
  4. 1 1
      src/map/party.c

+ 4 - 0
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

+ 1 - 1
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

+ 1 - 4
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) {

+ 1 - 1
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);