summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/script.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 885f36830..b0e08aa33 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/07/29
+ * Added a return value to buildin_rid2name if rid is invalid [Toms]
* Made the SQL ping interval default to 7 hours. [Skotlex]
* Made skill_unitsetting remove the group when no unit-cells were placed
down. basicly this means that if landprotector blocks all tiles, the group
diff --git a/src/map/script.c b/src/map/script.c
index 42fa4ed60..a6ad56ffe 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11674,6 +11674,9 @@ int buildin_rid2name(struct script_state *st){
push_str(st->stack,C_CONSTSTR,"");
break;
}
+ } else {
+ ShowError("buildin_rid2name: invalid RID\n");
+ push_str(st->stack,C_CONSTSTR,"(null)");
}
return 0;
}