summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-08 13:06:08 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-08 13:06:08 +0000
commiteb5205ba5ba276ef8fb3487517085f363d5c84bb (patch)
tree0fb8cd9d60636035682592c03599fd69d898889f
parent5f686a30412eefcfaebbd1fe72e83dcaca21ce19 (diff)
downloadhercules-eb5205ba5ba276ef8fb3487517085f363d5c84bb.tar.gz
hercules-eb5205ba5ba276ef8fb3487517085f363d5c84bb.tar.bz2
hercules-eb5205ba5ba276ef8fb3487517085f363d5c84bb.tar.xz
hercules-eb5205ba5ba276ef8fb3487517085f363d5c84bb.zip
Corrected definition of 'delitem' and 'delitem2', which prevented the optional accountid parameter from working (bugreport:1512).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12792 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/script.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7bd233fa6..c703bea91 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,8 +4,9 @@ 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.
2008/06/08
+ * Corrected definition of 'delitem' and 'delitem2', which prevented the
+ optional accountid parameter from working (bugreport:1512) [ultramage]
* Fixed SA_DISPELL removing SC_CRITICALWOUND. [Brainstorm]
-
2008/06/07
* Swapped the W_SHOTGUN and W_GATLING weapon type IDs [ultramage]
* Fixed GD_EMERGENCYCALL not working inside gvg castles when WoE is off, bugreport:1637 fix by Meyraw [Brainstorm]
diff --git a/src/map/script.c b/src/map/script.c
index a6340a2f5..83c9f31ef 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -13307,8 +13307,8 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(getnameditem,"is"),
BUILDIN_DEF2(grouprandomitem,"groupranditem","i"),
BUILDIN_DEF(makeitem,"iisii"),
- BUILDIN_DEF(delitem,"ii"),
- BUILDIN_DEF(delitem2,"iiiiiiiii"),
+ BUILDIN_DEF(delitem,"ii?"),
+ BUILDIN_DEF(delitem2,"iiiiiiiii?"),
BUILDIN_DEF2(enableitemuse,"enable_items",""),
BUILDIN_DEF2(disableitemuse,"disable_items",""),
BUILDIN_DEF(cutin,"si"),