From 6aa1ac3bede23b22ca1a8919818f226225c21165 Mon Sep 17 00:00:00 2001 From: skotlex Date: Sun, 17 Sep 2006 07:38:10 +0000 Subject: - Fixed NPC_INVISIBLE's cloak ending after attacking once. - Fixed SG_FUSION being castable without Soul Link state. - Moved the item-use restriction SC checks from clif.c to pc_use_item, fixed Gravitation blocking potion usage on it's area of effect. - Sphere Marines and Summoned Flora are now inmune to class-changing. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8782 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index 057e5e59d..bd02b1ec3 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2938,10 +2938,13 @@ int pc_useitem(struct map_session_data *sd,int n) sd->sc.data[SC_MARIONETTE].timer!=-1 || (sd->sc.data[SC_GRAVITATION].timer!=-1 && sd->sc.data[SC_GRAVITATION].val3 == BCT_SELF) || //Cannot use Potions/Healing items while under Gospel. - (sd->sc.data[SC_GOSPEL].timer!=-1 && sd->sc.data[SC_GOSPEL].val4 == BCT_SELF && sd->inventory_data[n]->type == IT_HEALING) + (sd->sc.data[SC_GOSPEL].timer!=-1 && sd->sc.data[SC_GOSPEL].val4 == BCT_SELF && sd->inventory_data[n]->type == IT_HEALING) || + sd->sc.data[SC_TRICKDEAD].timer != -1 || + sd->sc.data[SC_BLADESTOP].timer != -1 || + (sd->sc.data[SC_NOCHAT].timer!=-1 && sd->sc.data[SC_NOCHAT].val1&MANNER_NOITEM) )) return 0; - + sd->itemid = sd->status.inventory[n].nameid; sd->itemindex = n; amount = sd->status.inventory[n].amount; -- cgit v1.2.3-70-g09d2