summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-31 22:04:58 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-31 22:04:58 +0000
commit24ca308a22c1ac08d49110de4c469a3ebf16e785 (patch)
tree974ed5ec7103469bc94bd87980f33d6585a970b3
parent02b463f620c6e76a85a9600b14ec8f8cd69adcd8 (diff)
downloadhercules-24ca308a22c1ac08d49110de4c469a3ebf16e785.tar.gz
hercules-24ca308a22c1ac08d49110de4c469a3ebf16e785.tar.bz2
hercules-24ca308a22c1ac08d49110de4c469a3ebf16e785.tar.xz
hercules-24ca308a22c1ac08d49110de4c469a3ebf16e785.zip
- Protection for mercenary scrolls. (Don't consume it if you already have a mercenary).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13162 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/pc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 3bf3fc22e..84ad0f05e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3140,6 +3140,9 @@ int pc_isUseitem(struct map_session_data *sd,int n)
break;
}
+ if( nameid >= 12153 && nameid <= 12182 && sd->md != NULL )
+ return 0; // Mercenary Scrolls
+
//added item_noequip.txt items check by Maya&[Lupus]
if (
(map[sd->bl.m].flag.pvp && item->flag.no_equip&1) || // PVP