From cd40a623549f42d77c54515360813131e6c9c33d Mon Sep 17 00:00:00 2001 From: zephyrus Date: Tue, 12 May 2009 16:47:12 +0000 Subject: - 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 --- src/map/skill.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/map/skill.c') 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; -- cgit v1.2.3-70-g09d2