diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/script.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e5016800c..adc8459b5 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/10/30
+ * Fixed getcharid according to samples and docs. [Lupus]
+ Thanks to joshuaali for pointing it out. eAPP has no such bug
2006/10/27
* Fixed mob-skill event "skillused" not triggering at all. [Skotlex]
* Summoned mobs will only be removed from a map if their master is also
diff --git a/src/map/script.c b/src/map/script.c index 50c665086..d277065fb 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -5636,8 +5636,8 @@ int buildin_getcharid(struct script_state *st) sd=map_nick2sd(conv_str(st,& (st->stack->stack_data[st->start+3]))); else sd=script_rid2sd(st); - if(sd==NULL){ - push_val(st->stack,C_INT,-1); + if(sd==NULL || num<0 || num>3){ + push_val(st->stack,C_INT,0); //return 0, according docs return 0; } if(num==0) |