summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-22 09:40:18 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-22 09:40:18 +0000
commit10c9dec6be104140973e3d5848714244948efb7d (patch)
tree754da50a0669b29e46139e5a4d22c01f33d53d01
parentf802229a182ff7b88719dcbdf89716ab52751ab8 (diff)
downloadhercules-10c9dec6be104140973e3d5848714244948efb7d.tar.gz
hercules-10c9dec6be104140973e3d5848714244948efb7d.tar.bz2
hercules-10c9dec6be104140973e3d5848714244948efb7d.tar.xz
hercules-10c9dec6be104140973e3d5848714244948efb7d.zip
* Excluded idle and auto-trade party members from TK_POWER list.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6688 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/party.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e7b97ffec..acce88d5f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/05/22
+ * Excluded idle and auto-trade party members from TK_POWER list. [Lance]
* Fixed compilation errors.
Tidy up jobmaster for easy debugging. [Lance]
2006/05/21
diff --git a/src/map/party.c b/src/map/party.c
index 7c72d23ad..d4b6d86b6 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -776,7 +776,10 @@ return 0;
// party_foreachsamemap(party_sub_count, sd, 0, &c);
int party_sub_count(struct block_list *bl, va_list ap)
{
- return 1;
+ if(!(((TBL_PC *)bl)->state.autotrade) && (((TBL_PC *)bl)->idletime < (last_tick - battle_config.idle_no_share)))
+ return 1;
+ else
+ return 0;
}
// 同じマップのパーティメンバー全体に処理をかける