diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-20 13:48:51 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-20 13:48:51 +0000 |
| commit | ee7973243ce46493377a8554e7b8bd105ed7b917 (patch) | |
| tree | 424fd41d3c14b13ccb66d3d9a69e178fcd1ccce9 | |
| parent | d0bc9bb36227c2414e908cdfd61cc77d06fe6629 (diff) | |
| download | hercules-ee7973243ce46493377a8554e7b8bd105ed7b917.tar.gz hercules-ee7973243ce46493377a8554e7b8bd105ed7b917.tar.bz2 hercules-ee7973243ce46493377a8554e7b8bd105ed7b917.tar.xz hercules-ee7973243ce46493377a8554e7b8bd105ed7b917.zip | |
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8824 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/party.c | 10 |
3 files changed, 13 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 35595231c..789274028 100644 --- a/Changelog-Trunk.txt +++ b/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 @/#
diff --git a/src/map/clif.c b/src/map/clif.c index a7e377552..68775f7fe 100644 --- a/src/map/clif.c +++ b/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;
diff --git a/src/map/party.c b/src/map/party.c index 10ab78e5b..ad7274f67 100644 --- a/src/map/party.c +++ b/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,...)
|