diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-15 18:35:18 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-15 18:35:18 +0000 |
| commit | fcc3b82cb7a3676ba7bb9c7901012b7c06e5f7b3 (patch) | |
| tree | 318c6c8626375d793cb395cd3dd4d09ce70c4344 /src/map/skill.c | |
| parent | 07171348bda5027a11a13e1d946fffc48a0ead09 (diff) | |
| download | hercules-fcc3b82cb7a3676ba7bb9c7901012b7c06e5f7b3.tar.gz hercules-fcc3b82cb7a3676ba7bb9c7901012b7c06e5f7b3.tar.bz2 hercules-fcc3b82cb7a3676ba7bb9c7901012b7c06e5f7b3.tar.xz hercules-fcc3b82cb7a3676ba7bb9c7901012b7c06e5f7b3.zip | |
- Fixed the nocast flag 2 (not usable in pvp) returning true in pk-mode servers.
- When removing a castle's owning guild, the char servers will erase the guardian data now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6602 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 878436381..1437b2a13 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -821,13 +821,15 @@ int skillnotok(int skillid, struct map_session_data *sd) // Check skill restrictions [Celest]
if(!map_flag_vs(sd->bl.m) && skill_get_nocast (skillid) & 1)
return 1;
- if(map[sd->bl.m].flag.pvp && skill_get_nocast (skillid) & 2)
+ if(map[sd->bl.m].flag.pvp) {
+ if(!battle_config.pk_mode && skill_get_nocast (skillid) & 2)
+ return 1;
+ if(battle_config.pk_mode && skill_get_nocast (skillid) & 16)
return 1;
+ }
if(map_flag_gvg(sd->bl.m) && skill_get_nocast (skillid) & 4)
return 1;
- if (agit_flag && skill_get_nocast (skillid) & 8)
- return 1;
- if (battle_config.pk_mode && map[sd->bl.m].flag.pvp && skill_get_nocast (skillid) & 16)
+ if(agit_flag && skill_get_nocast (skillid) & 8)
return 1;
if(map[sd->bl.m].flag.restricted && map[sd->bl.m].zone && skill_get_nocast (skillid) & (8*map[sd->bl.m].zone))
return 1;
|