mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codefix: restore _generating_world and nearest town cache when failing to fund a random town (#13042)

pull/13045/head
Loïc Guilloux 2024-10-29 19:56:15 +01:00 committed by GitHub
parent 883be19865
commit 9dae626237
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/town_cmd.cpp
View File

@ -2170,17 +2170,19 @@ std::tuple<CommandCost, Money, TownID> CmdFoundTown(DoCommandFlag flags, TileInd
Town *t; Town *t;
if (random_location) { if (random_location) {
t = CreateRandomTown(20, townnameparts, size, city, layout); t = CreateRandomTown(20, townnameparts, size, city, layout);
if (t == nullptr) return { CommandCost(STR_ERROR_NO_SPACE_FOR_TOWN), 0, INVALID_TOWN };
} else { } else {
t = new Town(tile); t = new Town(tile);
DoCreateTown(t, tile, townnameparts, size, city, layout, true); DoCreateTown(t, tile, townnameparts, size, city, layout, true);
} }
new_town = t->index;
UpdateNearestTownForRoadTiles(false); UpdateNearestTownForRoadTiles(false);
old_generating_world.Restore(); old_generating_world.Restore();
if (t != nullptr && !text.empty()) { if (t == nullptr) return { CommandCost(STR_ERROR_NO_SPACE_FOR_TOWN), 0, INVALID_TOWN };
new_town = t->index;
if (!text.empty()) {
t->name = text; t->name = text;
t->UpdateVirtCoord(); t->UpdateVirtCoord();
} }