diff options
| author | MadCamel <madcamel@gmail.com> | 2009-09-30 13:53:33 -0400 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2009-09-30 13:53:33 -0400 |
| commit | 3fc3d83aa0be31e6d51afac54ff76b447f99f711 (patch) | |
| tree | 2deac15b3e34382f11a27090e3f1a8ef3049618b /src/map/party.c | |
| parent | 5967577d8bf92a9912cd153b20597f0d13a19456 (diff) | |
| parent | 48d96bc41a4791b6cb0bc2cf514a6cc1f06c4dd8 (diff) | |
| download | tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.tar.gz tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.tar.bz2 tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.tar.xz tmwa-3fc3d83aa0be31e6d51afac54ff76b447f99f711.zip | |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map/party.c')
| -rw-r--r-- | src/map/party.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/map/party.c b/src/map/party.c index feacc25..62b30d8 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -14,6 +14,7 @@ #include "battle.h" #include "intif.h" #include "clif.h" +#include "skill.h" #ifdef MEMWATCH #include "memwatch.h" @@ -203,23 +204,28 @@ int party_invite(struct map_session_data *sd,int account_id) if(tsd==NULL || p==NULL) return 0; + + printf("\tA\n"); + if(!battle_config.invite_request_check) { - if (tsd->guild_invite>0 || tsd->trade_partner) { // 相手が取引中かどうか + if (tsd->guild_invite>0 || tsd->trade_partner || tsd->npc_id || tsd->npc_shopid || pc_checkskill(tsd,NV_PARTY) < 1) { clif_party_inviteack(sd,tsd->status.name,0); return 0; } } + printf("\tB\n"); if( tsd->status.party_id>0 || tsd->party_invite>0 ){ // 相手の所属確認 clif_party_inviteack(sd,tsd->status.name,0); return 0; } + printf("\tC\n"); for(i=0;i<MAX_PARTY;i++){ // 同アカウント確認 if(p->member[i].account_id==account_id){ clif_party_inviteack(sd,tsd->status.name,0); return 0; } } - + printf("\tD\n"); tsd->party_invite=sd->status.party_id; tsd->party_invite_account=sd->status.account_id; |