From d5a2dc1d0bf5af3b09965cbe11e8238432af05c1 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 12 Mar 2009 15:14:22 +0000 Subject: (svn r15689) -Fix [FS#2720]: do not crash when the generate map doesn't contain a suitable location for a town. --- src/town_cmd.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/town_cmd.cpp') diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index c8cdf6af4..f656fe76b 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1648,8 +1648,10 @@ bool GenerateTowns(TownLayout layout) /* give it a last try, but now more aggressive */ if (num == 0 && CreateRandomTown(10000, TS_RANDOM, false, layout) == NULL) { if (GetNumTowns() == 0) { - /* XXX - can we handle that more gracefully? */ - if (_game_mode != GM_EDITOR) usererror("Could not generate any town"); + if (_game_mode != GM_EDITOR) { + extern StringID _switch_mode_errorstr; + _switch_mode_errorstr = STR_COULD_NOT_CREATE_TOWN; + } return false; } -- cgit v1.2.3-54-g00ecf