dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework end loop in GrowTownWithBridge

Browse Source 
Rework the end loop in GrowTownWithBridge to keep track of bridge
types already tried. This also fixes a bug that prevented the last
bridge type from being tried at all.

(cherry picked from commit 2b1d2c5887f8c3e27a8229ef87d670395aab2011)
This commit is contained in:
cirdan
2016-06-05 10:19:02 +02:00
committed by Jonathan G Rennison
parent f41a125d8e
commit c6d4a6b5e4
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/town_cmd.cpp
View File

@@ -10,6 +10,9 @@
/** @file town_cmd.cpp Handling of town tiles. */ /** @file town_cmd.cpp Handling of town tiles. */
#include "stdafx.h" #include "stdafx.h"
#include <bitset>
#include "road_internal.h" /* Cleaning up road bits */ #include "road_internal.h" /* Cleaning up road bits */
#include "road_cmd.h" #include "road_cmd.h"
#include "landscape.h" #include "landscape.h"
@@ -1263,17 +1266,33 @@ static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDi
/* no water tiles in between? */ /* no water tiles in between? */
if (bridge_length == 1) return false; if (bridge_length == 1) return false;
for (uint8 times = 0; times <= 22; times++) { std::bitset <MAX_BRIDGES> tried;
byte bridge_type = RandomRange(MAX_BRIDGES - 1); uint n = MAX_BRIDGES;
byte bridge_type = RandomRange (n);
for (;;) {
/* Can we actually build the bridge? */ /* Can we actually build the bridge? */
if (DoCommand(tile, bridge_tile, bridge_type | ROADTYPES_ROAD << 8 | TRANSPORT_ROAD << 15, CommandFlagsToDCFlags(GetCommandFlags(CMD_BUILD_BRIDGE)), CMD_BUILD_BRIDGE).Succeeded()) { if (DoCommand(tile, bridge_tile, bridge_type | ROADTYPES_ROAD << 8 | TRANSPORT_ROAD << 15, CommandFlagsToDCFlags(GetCommandFlags(CMD_BUILD_BRIDGE)), CMD_BUILD_BRIDGE).Succeeded()) {
DoCommand(tile, bridge_tile, bridge_type | ROADTYPES_ROAD << 8 | TRANSPORT_ROAD << 15, DC_EXEC | CommandFlagsToDCFlags(GetCommandFlags(CMD_BUILD_BRIDGE)), CMD_BUILD_BRIDGE); DoCommand(tile, bridge_tile, bridge_type | ROADTYPES_ROAD << 8 | TRANSPORT_ROAD << 15, DC_EXEC | CommandFlagsToDCFlags(GetCommandFlags(CMD_BUILD_BRIDGE)), CMD_BUILD_BRIDGE);
_grow_town_result = GROWTH_SUCCEED; _grow_town_result = GROWTH_SUCCEED;
return true; return true;
} }
/* Try a different bridge. */
tried[bridge_type] = true;
n--;
assert (n + tried.count() == MAX_BRIDGES);
if (n == 0) break;
bridge_type = 0;
uint i = RandomRange (n);
while (tried[bridge_type] || (i-- > 0)) {
bridge_type++;
assert (bridge_type < MAX_BRIDGES);
}
} }
/* Quit if it selecting an appropriate bridge type fails a large number of times. */
/* Quit if no bridge can be built. */
return false; return false;
} }