diff options
| author | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 14:13:26 +0000 |
|---|---|---|
| committer | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 14:13:26 +0000 |
| commit | 4d0d981ae30ca3b643e8727e2e5087b957e5d27a (patch) | |
| tree | 3842a643265d4992875707782d83117144316ad2 /src/map/atcommand.c | |
| parent | 13e152b1a9819d6587c9702b7eccd174e62b5e8b (diff) | |
| download | hercules-4d0d981ae30ca3b643e8727e2e5087b957e5d27a.tar.gz hercules-4d0d981ae30ca3b643e8727e2e5087b957e5d27a.tar.bz2 hercules-4d0d981ae30ca3b643e8727e2e5087b957e5d27a.tar.xz hercules-4d0d981ae30ca3b643e8727e2e5087b957e5d27a.zip | |
- Re-committed r16981/trunk/src/ and follow up r16988/trunk/src/ (pid:161281).
-Fix previous recommit since r16995
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16999 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index b2cbab558..3436f274c 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3644,7 +3644,7 @@ ACMD_FUNC(guildrecall) if (sd->status.account_id != pl_sd->status.account_id && pl_sd->status.guild_id == g->guild_id) { if (pc_get_group_level(pl_sd) > pc_get_group_level(sd) || (pl_sd->bl.m == sd->bl.m && pl_sd->bl.x == sd->bl.x && pl_sd->bl.y == sd->bl.y)) - continue; // Skip GMs greater than you... and chars already on the cell + continue; // Skip GMs greater than you... or chars already on the cell if (pl_sd->bl.m >= 0 && map[pl_sd->bl.m].flag.nowarp && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) count++; else @@ -3703,7 +3703,7 @@ ACMD_FUNC(partyrecall) if (sd->status.account_id != pl_sd->status.account_id && pl_sd->status.party_id == p->party.party_id) { if (pc_get_group_level(pl_sd) > pc_get_group_level(sd) || (pl_sd->bl.m == sd->bl.m && pl_sd->bl.x == sd->bl.x && pl_sd->bl.y == sd->bl.y)) - continue; // Skip GMs greater than you... and chars already on the cell + continue; // Skip GMs greater than you... or chars already on the cell if (pl_sd->bl.m >= 0 && map[pl_sd->bl.m].flag.nowarp && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) count++; else |