summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/script.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0f5a54151..2a6d9fda4 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/28
+ * Added a check in script command "set_option" so that invoking
+ "set_option(0)" removes Cart/Peco/Falcon, as expected by scripts. [Skotlex]
* Added trade-range check on trade start. [Skotlex]
* Added inf2 4096 (INF2_ALLOW_ENEMY) which is to be used in conjunction
with INF2_PARTY_ONLY/INF2_GUILD_ONLY when said skill should ALSO be allowed
diff --git a/src/map/script.c b/src/map/script.c
index 692b985b4..3f7b98aaa 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -5285,7 +5285,10 @@ int buildin_setoption(struct script_state *st)
type=conv_num(st,& (st->stack->stack_data[st->start+2]));
if(st->end>st->start+3 )
flag=conv_num(st,&(st->stack->stack_data[st->start+3]) );
-
+ else if (!type) { //Request to remove everything.
+ flag = 0;
+ type = OPTION_CART|OPTION_FALCON|OPTION_RIDING;
+ }
sd=script_rid2sd(st);
if (!sd) return 0;