(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.

  NoAI is an API (a framework) to build your own AIs in. See:
   http://wiki.openttd.org/wiki/index.php/AI:Main_Page
 With many thanks to:
  - glx and Rubidium for their syncing, feedback and hard work
  - Yexo for his feedback, patches, and AIs which tested the system very deep
  - Morloth for his feedback and patches
  - TJIP for hosting a challenge which kept NoAI on track
  - All AI authors for testing our AI API, and all other people who helped in one way or another
-Remove: all old AIs and their cheats/hacks

1 files changed, 6 insertions, 0 deletions

diff --git a/src/signs.cpp b/src/signs.cpp
index 7866783c7..22fe2a421 100644
--- a/src/signs.cpp
+++ b/src/signs.cpp
@@ -97,6 +97,9 @@ CommandCost CmdPlaceSign(TileIndex tile, uint32 flags, uint32 p1, uint32 p2, con
 	/* Try to locate a new sign */
 	if (!Sign::CanAllocateItem()) return_cmd_error(STR_2808_TOO_MANY_SIGNS);
 
+	/* Check sign text length if any */
+	if (!StrEmpty(text) && strlen(text) >= MAX_LENGTH_SIGN_NAME_BYTES) return CMD_ERROR;
+
 	/* When we execute, really make the sign */
 	if (flags & DC_EXEC) {
 		Sign *si = new Sign(_current_company);
@@ -106,6 +109,9 @@ CommandCost CmdPlaceSign(TileIndex tile, uint32 flags, uint32 p1, uint32 p2, con
 		si->x = x;
 		si->y = y;
 		si->z = GetSlopeZ(x, y);
+		if (!StrEmpty(text)) {
+			si->name = strdup(text);
+		}
 		UpdateSignVirtCoords(si);
 		MarkSignDirty(si);
 		InvalidateWindowData(WC_SIGN_LIST, 0, 0);