diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-30 17:10:03 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-30 17:10:03 +0000 |
| commit | 56f8c49f065831c21156dd88bd5397b6ba355813 (patch) | |
| tree | b667b75966806a271eeee6ac72e42a7aacfeb0bd /src/map/party.c | |
| parent | c883ca205971275e576d34b54304c3c5c30f3580 (diff) | |
| download | hercules-56f8c49f065831c21156dd88bd5397b6ba355813.tar.gz hercules-56f8c49f065831c21156dd88bd5397b6ba355813.tar.bz2 hercules-56f8c49f065831c21156dd88bd5397b6ba355813.tar.xz hercules-56f8c49f065831c21156dd88bd5397b6ba355813.zip | |
* Added base code for loading Ser's UPNP plugin
* Added 'idle_no_share' to battle_athena.conf
* Added item_findingore.txt
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1343 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/party.c')
| -rw-r--r-- | src/map/party.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/map/party.c b/src/map/party.c index 17f0cf5eb..7eb3f02dc 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -586,23 +586,23 @@ int party_exp_share(struct party *p,int map,int base_exp,int job_exp,int zeny) nullpo_retr(0, p); - for(i=c=0;i<MAX_PARTY;i++) - if((sd=p->member[i].sd)!=NULL && p->member[i].online && sd->bl.m==map && session[sd->fd] != NULL) + for (i=c=0; i < MAX_PARTY; i++) + if ((sd = p->member[i].sd) != NULL && p->member[i].online && sd->bl.m == map /*&& session[sd->fd] != NULL*/) // should be done in socket.c c++; - - if(c==0) + + if(c == 0) return 0; - for(i=0;i<MAX_PARTY;i++) - if((sd=p->member[i].sd)!=NULL && p->member[i].online && sd->bl.m==map && session[sd->fd] != NULL) { - if (/* pc_issit(sd) || */ sd->chatID || (sd->idletime < (tick_ - 120))) + for (i = 0; i < MAX_PARTY; i++) + if ((sd = p->member[i].sd) != NULL && p->member[i].online && sd->bl.m == map /*&& session[sd->fd] != NULL*/) { + if (battle_config.idle_no_share && (/* pc_issit(sd) || */ sd->chatID || (sd->idletime < (tick_ - 120)))) continue; -#ifdef TWILIGHT + #ifdef TWILIGHT pc_gainexp(sd,base_exp,job_exp); -#else - pc_gainexp(sd,base_exp/c+1,job_exp/c+1); -#endif - if(battle_config.zeny_from_mobs) // zeny from mobs [Valaris] - pc_getzeny(sd,zeny/c+1); + #else + pc_gainexp(sd,(base_exp/c)+1,(job_exp/c)+1); + #endif + if (battle_config.zeny_from_mobs) // zeny from mobs [Valaris] + pc_getzeny(sd,(zeny/c)+1); } return 0; } |