diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-13 16:16:08 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-13 16:16:08 +0000 |
| commit | e9e4993f8b4d0a8e427a369ded2cd0a45322aac3 (patch) | |
| tree | 1bee5d628620b20c894567e79fd5cdef1f133282 /src/map/pc.c | |
| parent | 7f2dbf6889124f31e19074a6bf185a215459e401 (diff) | |
| download | hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.tar.gz hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.tar.bz2 hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.tar.xz hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.zip | |
Follow up r16738 MO_ETREMITYFIST renewal behavior.
Fixed bugreport:6580 where SC_MANHOLE targets can use items.
Fixed bugreport:6636 a typo formula in WL_WHITEIMPRISON.
Fixed bugreport:6685 a missing column in skill_cast_db.txt for WL_COMET entry.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16776 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index a8ccc5c47..ce58ed4b9 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4145,6 +4145,7 @@ int pc_useitem(struct map_session_data *sd,int n) sd->sc.data[SC_TRICKDEAD] || sd->sc.data[SC_HIDING] || sd->sc.data[SC__SHADOWFORM] || + sd->sc.data[SC__MANHOLE] || sd->sc.data[SC_KAGEHUMI] || (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM) )) @@ -6957,14 +6958,8 @@ int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp) sp += sp / 10; } #ifdef RENEWAL - if( sd->sc.data[SC_EXTREMITYFIST] ){ - const struct TimerData *timer; - int tick = skill_get_time2(MO_EXTREMITYFIST, sd->sc.data[SC_EXTREMITYFIST]->val1); - - timer = get_timer(sd->sc.data[SC_EXTREMITYFIST]->timer); - if( DIFF_TICK(tick, DIFF_TICK(timer->tick, gettick())) < 10000 )// 10 sec - sp = 0; - } + if( sd->sc.data[SC_EXTREMITYFIST2] ) + sp = 0; #endif } |