diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-07 15:40:55 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-07 15:40:55 +0000 |
| commit | 4862df1325bab71999a31fbbae196df361cea929 (patch) | |
| tree | 21b8b2e0b16fea9a293626d60c573f48c793497d /src/map/guild.c | |
| parent | 65b551f2194c3c78d33bd4fe77b3732bae23e301 (diff) | |
| download | hercules-4862df1325bab71999a31fbbae196df361cea929.tar.gz hercules-4862df1325bab71999a31fbbae196df361cea929.tar.bz2 hercules-4862df1325bab71999a31fbbae196df361cea929.tar.xz hercules-4862df1325bab71999a31fbbae196df361cea929.zip | |
- Fixed pc_setpos ignoring the clrtype sent to it.
- unit_free will now use clear type 3 for players (warping out effect)
- You can't invite someone to a guild now within Guild Castles.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5945 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index da579300f..5a4162730 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -641,11 +641,14 @@ int guild_invite(struct map_session_data *sd,int account_id) return 0;
}
}
- if( tsd->status.guild_id>0 || tsd->guild_invite>0 ){ // 相手の所属確認
+ if(tsd->status.guild_id>0 ||
+ tsd->guild_invite>0 ||
+ map[tsd->bl.m].flag.gvg_castle)
+ { //Can't invite people inside castles. [Skotlex]
clif_guild_inviteack(sd,0);
return 0;
}
-
+
// 定員確認
for(i=0;i<g->max_member;i++)
if(g->member[i].account_id==0)
|