summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authormarkzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-05 19:08:28 +0000
committermarkzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-05 19:08:28 +0000
commit92acb858e0706b7dca01174d753adf4e4ab78dc8 (patch)
tree022c99f60f73c482cee6433ad35db9b141ad1a36 /src/map/pc.c
parent4463d3c44108b98735aaccd21b821647da6e23cc (diff)
downloadhercules-92acb858e0706b7dca01174d753adf4e4ab78dc8.tar.gz
hercules-92acb858e0706b7dca01174d753adf4e4ab78dc8.tar.bz2
hercules-92acb858e0706b7dca01174d753adf4e4ab78dc8.tar.xz
hercules-92acb858e0706b7dca01174d753adf4e4ab78dc8.zip
- Added safer multiplication in battle formulas to prevent int32 from overflowing when High damage is dealt. (bugreport:6952)
- Fixed a typo which was preventing rental items from properly disappearing when deleted. (bugreport:6971) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17004 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 56da83e32..c6c28edcc 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -463,7 +463,7 @@ void pc_inventory_rentals(struct map_session_data *sd)
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);
+ pc_delitem(sd, i, sd->status.inventory[i].amount, 0, 0, LOG_TYPE_OTHER);
} 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));