diff options
| author | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-11 21:07:30 +0000 |
|---|---|---|
| committer | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-11 21:07:30 +0000 |
| commit | b46bf4721349c2f1bdb6d1217c51459839a85c1d (patch) | |
| tree | 03edec39fd7b1fe3cf8a7c2264f4b1c4226cc6f8 /src/map/pc.c | |
| parent | 3547371b9785107171e7c7ecb746931156955e5f (diff) | |
| download | hercules-b46bf4721349c2f1bdb6d1217c51459839a85c1d.tar.gz hercules-b46bf4721349c2f1bdb6d1217c51459839a85c1d.tar.bz2 hercules-b46bf4721349c2f1bdb6d1217c51459839a85c1d.tar.xz hercules-b46bf4721349c2f1bdb6d1217c51459839a85c1d.zip | |
1 fixed drops log
2 made possible to disable consumable items (potions, berries, etc) during GvG, PvP
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1079 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 0734c0630..1129489bd 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -560,9 +560,9 @@ int pc_isequip(struct map_session_data *sd,int n) return 0; // if(((1<<sd->status.class_)&item->class_) == 0) // return 0; - if(map[sd->bl.m].flag.pvp && (item->flag.no_equip==1 || item->flag.no_equip==3)) + if(map[sd->bl.m].flag.pvp && (item->flag.no_equip&1)) //optimized by Lupus return 0; - if(map[sd->bl.m].flag.gvg && (item->flag.no_equip==2 || item->flag.no_equip==3)) + if(map[sd->bl.m].flag.gvg && (item->flag.no_equip>1)) //optimized by Lupus return 0; if(item->equip & 0x0002 && sc_data && sc_data[SC_STRIPWEAPON].timer != -1) return 0; @@ -2295,6 +2295,9 @@ int pc_useitem(struct map_session_data *sd,int n) sd->status.inventory[n].amount <= 0 || sd->sc_data[SC_BERSERK].timer!=-1 || sd->sc_data[SC_MARIONETTE].timer!=-1 || + //added item_noequip.txt items check by Maya&[Lupus] + (map[sd->bl.m].flag.pvp && (sd->inventory_data[n]->flag.no_equip&1) ) || // PVP + (map[sd->bl.m].flag.gvg && (sd->inventory_data[n]->flag.no_equip>1) ) || // GVG !pc_isUseitem(sd,n) ) { clif_useitemack(sd,n,0,0); return 1; @@ -6028,10 +6031,10 @@ int pc_checkitem(struct map_session_data *sd) calc_flag = 1; } //?備制限チェック - if(sd->status.inventory[i].equip && map[sd->bl.m].flag.pvp && (it->flag.no_equip==1 || it->flag.no_equip==3)){//PvP制限 + if(sd->status.inventory[i].equip && map[sd->bl.m].flag.pvp && (it->flag.no_equip&1)){//PVP check for forbiden items. optimized by [Lupus] sd->status.inventory[i].equip=0; calc_flag = 1; - }else if(sd->status.inventory[i].equip && map[sd->bl.m].flag.gvg && (it->flag.no_equip==2 || it->flag.no_equip==3)){//GvG制限 + }else if(sd->status.inventory[i].equip && map[sd->bl.m].flag.gvg && (it->flag.no_equip>1)){//GvG optimized by [Lupus] sd->status.inventory[i].equip=0; calc_flag = 1; } |