diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-12 16:47:12 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-12 16:47:12 +0000 |
| commit | cd40a623549f42d77c54515360813131e6c9c33d (patch) | |
| tree | 09afde7308a84efae2982546f73d7231d2e355b0 /src/map/skill.c | |
| parent | 0c5e8296319a3f1396e0208fba16135ac2c7b4b0 (diff) | |
| download | hercules-cd40a623549f42d77c54515360813131e6c9c33d.tar.gz hercules-cd40a623549f42d77c54515360813131e6c9c33d.tar.bz2 hercules-cd40a623549f42d77c54515360813131e6c9c33d.tar.xz hercules-cd40a623549f42d77c54515360813131e6c9c33d.zip | |
- Rental items now can be stackable items too.
- Added @font command to test kRO fonts. (Client side requires : Langtype 0 / Hex + Fonts Files on the data folder).
- Rental now announces with a maximum time to fix a problem with 1 month or more rentals.
- Reduced amount of calculations of Flee on map change (only if required).
- More security on Rental items.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13761 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 767bb7833..e84562496 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7995,11 +7995,10 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in } //Consume sd->itemid = sd->itemindex = -1; - if(skill == WZ_EARTHSPIKE && sc && - sc->data[SC_EARTHSCROLL] && rand()%100 > sc->data[SC_EARTHSCROLL]->val2) // [marquis007] + if( skill == WZ_EARTHSPIKE && sc && sc->data[SC_EARTHSCROLL] && rand()%100 > sc->data[SC_EARTHSCROLL]->val2 ) // [marquis007] ; //Do not consume item. - else - pc_delitem(sd,i,1,0); + else if( sd->status.inventory[i].expire_time == 0 ) + pc_delitem(sd,i,1,0); // Rental usable items are not consumed until expiration } if (type&1) //Casting finished sd->skillitem = sd->skillitemlv = 0; |