diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-09-20 23:46:48 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-09-20 23:46:48 +0000 |
| commit | dbc3e0878510f5d8ae7d3aca21607bfa2648b421 (patch) | |
| tree | 87867007c2154b99b44924c907ecfbf553c6ebf1 /src/map/status.c | |
| parent | b793bb7e9eb87a9dddfb1f78c3ae0d795bdb14f8 (diff) | |
| download | hercules-dbc3e0878510f5d8ae7d3aca21607bfa2648b421.tar.gz hercules-dbc3e0878510f5d8ae7d3aca21607bfa2648b421.tar.bz2 hercules-dbc3e0878510f5d8ae7d3aca21607bfa2648b421.tar.xz hercules-dbc3e0878510f5d8ae7d3aca21607bfa2648b421.zip | |
* Applied map flag update patch provided by Daegaladh. Will mess with custom restricted items.
- Adds a reset mapflag which is checked when using the Neuralizer.
- Syncronizes the item_noequip_db bitmasks with with skill_nocast_db.
- Updates mapflags, and both skills and items which are restricted.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14961 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c index 89ad5c483..3ec822a6a 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1992,11 +1992,15 @@ int status_calc_pc_(struct map_session_data* sd, bool first) if(!data->script) continue; if(data->flag.no_equip) { //Card restriction checks. - if(map[sd->bl.m].flag.restricted && data->flag.no_equip&map[sd->bl.m].zone) + if(map[sd->bl.m].flag.restricted && data->flag.no_equip&(8*map[sd->bl.m].zone)) continue; - if(map[sd->bl.m].flag.pvp && data->flag.no_equip&1) + if(!map_flag_vs(sd->bl.m) && data->flag.no_equip&1) continue; - if(map_flag_gvg(sd->bl.m) && data->flag.no_equip&2) + if(map[sd->bl.m].flag.pvp && data->flag.no_equip&2) + continue; + if(map_flag_gvg(sd->bl.m) && data->flag.no_equip&4) + continue; + if(map[sd->bl.m].flag.battleground && data->flag.no_equip&8) continue; } if(i == EQI_HAND_L && sd->status.inventory[index].equip == EQP_HAND_L) |