Sfoglia il codice sorgente

- Fixed party_sub_count (TK_POWER) failing when the idle_no_share setting was disabled.
- Enabled Star Gladiators and Soul Linkers to do /doridori


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8824 54d463be-8e91-2dee-dedb-b68131a5f0ec

skotlex 18 anni fa
parent
commit
361b384e12
3 ha cambiato i file con 13 aggiunte e 3 eliminazioni
  1. 4 0
      Changelog-Trunk.txt
  2. 2 0
      src/map/clif.c
  3. 7 3
      src/map/party.c

+ 4 - 0
Changelog-Trunk.txt

@@ -3,6 +3,10 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/09/20
+	* Fixed party_sub_count (TK_POWER) failing when the idle_no_share setting
+	  was disabled. [Skotlex]
+	* Enabled Star Gladiators and Soul Linkers to do /doridori [Skotlex]
 2006/09/19
 	* Fixed nocommand mapflag causing the "you can't use commands on this map"
 	  message to trigger one very single chat, instead of only for actual @/#

+ 2 - 0
src/map/clif.c

@@ -11077,6 +11077,8 @@ void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd) {
 
 	switch (sd->class_&MAPID_UPPERMASK)
 	{
+		case MAPID_SOUL_LINKER:
+		case MAPID_STAR_GLADIATOR:
 		case MAPID_TAEKWON:
 			if (!sd->state.rest)
 				break;

+ 7 - 3
src/map/party.c

@@ -823,10 +823,14 @@ int party_send_dot_remove(struct map_session_data *sd)
 // party_foreachsamemap(party_sub_count, sd, 0, &c);
 int party_sub_count(struct block_list *bl, va_list ap)
 {
-	if(!(((TBL_PC *)bl)->state.autotrade) && (((TBL_PC *)bl)->idletime < (last_tick - battle_config.idle_no_share)))
-		return 1;
-	else
+	if(((TBL_PC *)bl)->state.autotrade)
+		return 0;
+		  
+	if(battle_config.idle_no_share &&
+		((TBL_PC *)bl)->idletime >= (last_tick - battle_config.idle_no_share))
 		return 0;
+
+	return 1;
 }
 
 int party_foreachsamemap(int (*func)(struct block_list*,va_list),struct map_session_data *sd,int range,...)