From c67c8f61845f858e28fcdfa84d8b94056026ca88 Mon Sep 17 00:00:00 2001 From: zephyrus Date: Sun, 31 Aug 2008 22:04:58 +0000 Subject: [PATCH] - Protection for mercenary scrolls. (Don't consume it if you already have a mercenary). git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13162 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/map/pc.c b/src/map/pc.c index 3bf3fc22e6..84ad0f05e9 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