summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-28 05:29:01 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-28 05:29:01 +0000
commitb76a55cb71b2db467b3b8d0559802671d88f0837 (patch)
treefbd7ad16793212166c71a25843b6c6cd06daaedb
parent3b4455299f3c5c0f6d6032c21c15f2e011639749 (diff)
downloadhercules-b76a55cb71b2db467b3b8d0559802671d88f0837.tar.gz
hercules-b76a55cb71b2db467b3b8d0559802671d88f0837.tar.bz2
hercules-b76a55cb71b2db467b3b8d0559802671d88f0837.tar.xz
hercules-b76a55cb71b2db467b3b8d0559802671d88f0837.zip
- Fixed unable to store n items into storage unless n was the total amount of items you had.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6794 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt6
-rw-r--r--src/map/storage.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1b3016add..24fd2e55f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,9 +4,11 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/28
- - Suppressed compilation warnings (unsigned and signed mismatches) [Lance]
+ * Fixed unable to store n items into storage unless n was the total amount
+ of items you had. [Skotlex]
+ * Suppressed compilation warnings (unsigned and signed mismatches) [Lance]
2006/05/27
- - Added structure status_data which holds status-related information (str,
+ * Added structure status_data which holds status-related information (str,
agi, etc, speed, amotion, adelay, dmotion, weapon-damage, race, size, etc)
and weapon_atk structure with the weapon specific info (atk, atk2, element)
to be used by all combat structures (TODO: Homun needs to be updated to use
diff --git a/src/map/storage.c b/src/map/storage.c
index 0184d2978..a0c82e839 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -242,7 +242,7 @@ int storage_storageadd(struct map_session_data *sd,int index,int amount)
if(sd->status.inventory[index].nameid <= 0)
return 0; //No item on that spot
- if(amount < 1 || amount < sd->status.inventory[index].amount)
+ if(amount < 1 || amount > sd->status.inventory[index].amount)
return 0;
// log_tostorage(sd, index, 0);