diff options
| author | shenhuyong <shenhuyong@hotmail.com> | 2013-10-03 14:26:16 +0800 |
|---|---|---|
| committer | shenhuyong <shenhuyong@hotmail.com> | 2013-10-03 14:26:16 +0800 |
| commit | d153854f32c4fd9265010e6936db49e23137db08 (patch) | |
| tree | 7b389a5693d5003e88880ce7bfb9d5500551ebb4 /src/map/guild.c | |
| parent | ea84a19426cd401615421ee3f3d2eff2d741beb7 (diff) | |
| parent | 2f2afbd3b63a75695f8f96e3bcb4db9fff5a7dc6 (diff) | |
| download | hercules-d153854f32c4fd9265010e6936db49e23137db08.tar.gz hercules-d153854f32c4fd9265010e6936db49e23137db08.tar.bz2 hercules-d153854f32c4fd9265010e6936db49e23137db08.tar.xz hercules-d153854f32c4fd9265010e6936db49e23137db08.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index b66961262..30f989f58 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -621,7 +621,7 @@ int guild_invite(struct map_session_data *sd, struct map_session_data *tsd) { if( tsd->status.guild_id > 0 || tsd->guild_invite > 0 - || ((map->agit_flag || map->agit2_flag) && maplist[tsd->bl.m].flag.gvg_castle) + || ((map->agit_flag || map->agit2_flag) && map->list[tsd->bl.m].flag.gvg_castle) ) { //Can't invite people inside castles. [Skotlex] clif->guild_inviteack(sd,0); @@ -806,7 +806,7 @@ int guild_leave(struct map_session_data* sd, int guild_id, int account_id, int c if( sd->status.account_id != account_id || sd->status.char_id != char_id || sd->status.guild_id != guild_id - || ((map->agit_flag || map->agit2_flag) && maplist[sd->bl.m].flag.gvg_castle) + || ((map->agit_flag || map->agit2_flag) && map->list[sd->bl.m].flag.gvg_castle) ) return 0; @@ -838,7 +838,7 @@ int guild_expulsion(struct map_session_data* sd, int guild_id, int account_id, i //Can't leave inside guild castles. if ((tsd = map->id2sd(account_id)) && tsd->status.char_id == char_id - && ((map->agit_flag || map->agit2_flag) && maplist[tsd->bl.m].flag.gvg_castle) + && ((map->agit_flag || map->agit2_flag) && map->list[tsd->bl.m].flag.gvg_castle) ) return 0; |