summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-15 09:10:56 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-15 09:10:56 +0000
commit54a5692881cda4d8479efd89f5e91b66b422e485 (patch)
treecb345d1589435dc2b63fa36dd903ea1190e53e7d
parentd4abb0c1814bc34503717c6b96a2a3a734f74969 (diff)
downloadhercules-54a5692881cda4d8479efd89f5e91b66b422e485.tar.gz
hercules-54a5692881cda4d8479efd89f5e91b66b422e485.tar.bz2
hercules-54a5692881cda4d8479efd89f5e91b66b422e485.tar.xz
hercules-54a5692881cda4d8479efd89f5e91b66b422e485.zip
* Supplied fake NPC ID in sd->npc_id for item scripts.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6590 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/pc.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1e6433533..7637af866 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/12
+ * Supplied fake NPC ID in sd->npc_id for item scripts. [Lance]
* Bugfix on fake npc [Lance]
* Fixed mob_once_spawn not working for non-random coordinates. [blackhole89]
* Reverted again the change that stuns the caster on Ske, Ska, Swoo when
diff --git a/src/map/pc.c b/src/map/pc.c
index ad3d758c3..42baf4f8e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2704,6 +2704,7 @@ int pc_useitem(struct map_session_data *sd,int n)
}
sd->canuseitem_tick= tick + battle_config.item_use_interval; //Update item use time.
+ sd->npc_id = fake_npc_id;
run_script(script,0,sd->bl.id,fake_npc_id);
potion_flag = 0;
return 1;