Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Corrected type of second argument of script command 'setbattleflag' from string to number (bugreport:4640, topic:261833, since r5407, related r14577).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14593 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2010-12-15 23:50:42 +00:00
parent 98c85e0d33
commit ddca23e35d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -1,6 +1,7 @@
Date Added Date Added
2010/12/15 2010/12/15
* Corrected type of second argument of script command 'setbattleflag' from string to number (bugreport:4640, topic:261833, since r5407, related r14577). [Ai4rei]
* Fixed missing check in cooking, causing cooking kit requirement could be bypassed by sending 0x25b (CZ_REQ_MAKINGITEM) directly (bugreport:4642, since r13628). [Ai4rei] * Fixed missing check in cooking, causing cooking kit requirement could be bypassed by sending 0x25b (CZ_REQ_MAKINGITEM) directly (bugreport:4642, since r13628). [Ai4rei]
2010/12/13 2010/12/13
* Fixed plugin 'sig' not being compilable on Mac OS X, due to different return value type of 'strsignal' (bugreport:4637). [Ai4rei] * Fixed plugin 'sig' not being compilable on Mac OS X, due to different return value type of 'strsignal' (bugreport:4637). [Ai4rei]

4
src/map/script.c
View File

@ -12088,7 +12088,7 @@ BUILDIN_FUNC(setbattleflag)
const char *flag, *value; const char *flag, *value;
flag = script_getstr(st,2); 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) if (battle_set_value(flag, value) == 0)
ShowWarning("buildin_setbattleflag: unknown battle_config flag '%s'\n",flag); 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(npcshopattach,"s?"),
BUILDIN_DEF(equip,"i"), BUILDIN_DEF(equip,"i"),
BUILDIN_DEF(autoequip,"ii"), BUILDIN_DEF(autoequip,"ii"),
BUILDIN_DEF(setbattleflag,"ss"), BUILDIN_DEF(setbattleflag,"si"),
BUILDIN_DEF(getbattleflag,"s"), BUILDIN_DEF(getbattleflag,"s"),
BUILDIN_DEF(setitemscript,"is?"), //Set NEW item bonus script. Lupus BUILDIN_DEF(setitemscript,"is?"), //Set NEW item bonus script. Lupus
BUILDIN_DEF(disguise,"i"), //disguise player. Lupus BUILDIN_DEF(disguise,"i"), //disguise player. Lupus