Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:5543 this item is official rentable and it should unmount upon expire.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15845 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-04-11 04:43:42 +00:00
parent f723992af9
commit badb682be9
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/map/itemdb.h
View File

@ -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,
};
/**

11
src/map/pc.c
View File

@ -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);