summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-15 23:50:42 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-15 23:50:42 +0000
commit75249417a0a7e234485ae763b6de8a3517ad77f9 (patch)
treefd906d56dfa07c54ae8ec4f1ac8587286325effb /src
parent4c5b1387b212850a38a3ac73eac4896c445323dc (diff)
downloadhercules-75249417a0a7e234485ae763b6de8a3517ad77f9.tar.gz
hercules-75249417a0a7e234485ae763b6de8a3517ad77f9.tar.bz2
hercules-75249417a0a7e234485ae763b6de8a3517ad77f9.tar.xz
hercules-75249417a0a7e234485ae763b6de8a3517ad77f9.zip
* Corrected type of second argument of script command 'setbattleflag' from string to number (bugreport:4640, topic:261833, since r5407, related r14577).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14593 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 72f6c3774..14b8806bc 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -12088,7 +12088,7 @@ BUILDIN_FUNC(setbattleflag)
const char *flag, *value;
flag = script_getstr(st,2);
- value = script_getstr(st,3);
+ value = script_getstr(st,3); // HACK: Retrieve number as string (auto-converted) for battle_set_value
if (battle_set_value(flag, value) == 0)
ShowWarning("buildin_setbattleflag: unknown battle_config flag '%s'\n",flag);
@@ -14776,7 +14776,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(npcshopattach,"s?"),
BUILDIN_DEF(equip,"i"),
BUILDIN_DEF(autoequip,"ii"),
- BUILDIN_DEF(setbattleflag,"ss"),
+ BUILDIN_DEF(setbattleflag,"si"),
BUILDIN_DEF(getbattleflag,"s"),
BUILDIN_DEF(setitemscript,"is?"), //Set NEW item bonus script. Lupus
BUILDIN_DEF(disguise,"i"), //disguise player. Lupus