summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-19 16:52:38 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-19 16:52:38 +0000
commit78029e9054ef623bbad9c789ecb9da5b87795666 (patch)
tree3f012c989b4d49bc5d4a4e29a2294381ed67aaa0
parent5dac152c3a1a27757e3a663f2cd5afc60526c024 (diff)
downloadhercules-78029e9054ef623bbad9c789ecb9da5b87795666.tar.gz
hercules-78029e9054ef623bbad9c789ecb9da5b87795666.tar.bz2
hercules-78029e9054ef623bbad9c789ecb9da5b87795666.tar.xz
hercules-78029e9054ef623bbad9c789ecb9da5b87795666.zip
- Small change in pc_additem that could be fixing the current bug with it.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6660 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/pc.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b6adeb321..8da51279c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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/19
+ * Small change in pc_additem that could be fixing the current bug with new
+ items not getting added. [Skotlex]
* Fixed loginlog definition in main.sql, thanks to Tempesta [Skotlex]
* Likely fixed the mob-skill random picking behaviour causing infinite
loops sometimes. [Skotlex]
diff --git a/src/map/pc.c b/src/map/pc.c
index 10567e56d..ee28d8d3e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2423,7 +2423,7 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount)
// clear equips field first, just in case
if (item_data->equip)
item_data->equip = 0;
- memcpy(&sd->status.inventory[i], item_data, sizeof(item_data));
+ memcpy(&sd->status.inventory[i], item_data, sizeof(sd->status.inventory[0]));
sd->status.inventory[i].amount = amount;
sd->inventory_data[i] = data;
clif_additem(sd,i,amount,0);