diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-11 04:43:42 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-11 04:43:42 +0000 |
| commit | 895fd7fd301368cbf21a13cf9a25be37d0256db3 (patch) | |
| tree | 5629e9b8ccb209ac21173a5305c7587005cf4dea /src | |
| parent | a23bc93b64df690d1b8ccef524e300ec712948dd (diff) | |
| download | hercules-895fd7fd301368cbf21a13cf9a25be37d0256db3.tar.gz hercules-895fd7fd301368cbf21a13cf9a25be37d0256db3.tar.bz2 hercules-895fd7fd301368cbf21a13cf9a25be37d0256db3.tar.xz hercules-895fd7fd301368cbf21a13cf9a25be37d0256db3.zip | |
Fixed bugreport:5543 this item is official rentable and it should unmount upon expire.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15845 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/itemdb.h | 10 | ||||
| -rw-r--r-- | src/map/pc.c | 11 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 632cbd42e..f2e6ae61d 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -17,8 +17,7 @@ #define MAX_SEARCH 5 //Designed for search functions, species max number of matches to display. -enum item_itemid -{ +enum item_itemid { ITEMID_EMPERIUM = 714, ITEMID_YELLOW_GEMSTONE = 715, ITEMID_RED_GEMSTONE = 716, @@ -27,14 +26,9 @@ enum item_itemid ITEMID_STONE = 7049, ITEMID_SKULL_ = 7420, ITEMID_TOKEN_OF_SIEGFRIED = 7621, -/** - * Ranger - **/ ITEMID_TRAP_ALLOY = 7940, -/** - * Arch Bishop - **/ ITEMID_ANCILLA = 12333, + ITEMID_REINS_OF_MOUNT = 12622, }; /** diff --git a/src/map/pc.c b/src/map/pc.c index 5f74574d6..c761f82c5 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -456,13 +456,14 @@ void pc_inventory_rentals(struct map_session_data *sd) if( sd->status.inventory[i].expire_time == 0 ) continue; - if( sd->status.inventory[i].expire_time <= time(NULL) ) - { + if( sd->status.inventory[i].expire_time <= time(NULL) ) { + if( sd->status.inventory[i].nameid == ITEMID_REINS_OF_MOUNT + && sd->sc.option&OPTION_MOUNTING ) { + pc_setoption(sd, sd->sc.option&~OPTION_MOUNTING); + } clif_rental_expired(sd->fd, i, sd->status.inventory[i].nameid); pc_delitem(sd, i, sd->status.inventory[i].amount, 1, 0, LOG_TYPE_OTHER); - } - else - { + } else { expire_tick = (unsigned int)(sd->status.inventory[i].expire_time - time(NULL)) * 1000; clif_rental_time(sd->fd, sd->status.inventory[i].nameid, (int)(expire_tick / 1000)); next_tick = min(expire_tick, next_tick); |