mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r23819) -Fix [FS#4951]: Removal of towns with 0 population failed during map generation.

This commit is contained in:
frosch 2012-01-17 18:46:09 +00:00
parent 3dcf19fd07
commit 2458a29fd0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/town_cmd.cpp
View File

@ -1820,6 +1820,8 @@ static TileIndex FindNearestGoodCoastalTownSpot(TileIndex tile, TownLayout layou
static Town *CreateRandomTown(uint attempts, uint32 townnameparts, TownSize size, bool city, TownLayout layout) static Town *CreateRandomTown(uint attempts, uint32 townnameparts, TownSize size, bool city, TownLayout layout)
{ {
assert(_game_mode == GM_EDITOR || _generating_world); // These are the preconditions for CMD_DELETE_TOWN
if (!Town::CanAllocateItem()) return NULL; if (!Town::CanAllocateItem()) return NULL;
do { do {
@ -1844,7 +1846,8 @@ static Town *CreateRandomTown(uint attempts, uint32 townnameparts, TownSize size
/* if the population is still 0 at the point, then the /* if the population is still 0 at the point, then the
* placement is so bad it couldn't grow at all */ * placement is so bad it couldn't grow at all */
if (t->population > 0) return t; if (t->population > 0) return t;
DoCommand(t->xy, t->index, 0, DC_EXEC, CMD_DELETE_TOWN); CommandCost rc = DoCommand(t->xy, t->index, 0, DC_EXEC, CMD_DELETE_TOWN);
assert(rc.Succeeded());
/* We already know that we can allocate a single town when /* We already know that we can allocate a single town when
* entering this function. However, we create and delete * entering this function. However, we create and delete
@ -2564,7 +2567,7 @@ CommandCost CmdExpandTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
} }
/** /**
* Delete a town (scenario editor only). * Delete a town (scenario editor or worldgen only).
* @param tile Unused. * @param tile Unused.
* @param flags Type of operation. * @param flags Type of operation.
* @param p1 Town ID to delete. * @param p1 Town ID to delete.
@ -2574,7 +2577,7 @@ CommandCost CmdExpandTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
*/ */
CommandCost CmdDeleteTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) CommandCost CmdDeleteTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{ {
if (_game_mode != GM_EDITOR) return CMD_ERROR; if (_game_mode != GM_EDITOR && !_generating_world) return CMD_ERROR;
Town *t = Town::GetIfValid(p1); Town *t = Town::GetIfValid(p1);
if (t == NULL) return CMD_ERROR; if (t == NULL) return CMD_ERROR;