diff options
| author | rubidium <rubidium@openttd.org> | 2007-06-10 10:52:19 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-06-10 10:52:19 +0000 |
| commit | 47d7124207e1674a2b6a900533a650a23c502b19 (patch) | |
| tree | 0736d9d7bc7a66896036459ed38ae35114292848 | |
| parent | e1b7b7aecc1b750bb2cc3c792d8c4898ebafe6c7 (diff) | |
| download | openttd-47d7124207e1674a2b6a900533a650a23c502b19.tar.xz | |
(svn r10081) -Fix [FS851]: towns/AIs didn't build bridges anymore (boekabart).
| -rw-r--r-- | src/ai/default/default.cpp | 6 | ||||
| -rw-r--r-- | src/town_cmd.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index d1435b6a8..3dca2825b 100644 --- a/src/ai/default/default.cpp +++ b/src/ai/default/default.cpp @@ -2888,7 +2888,7 @@ static inline void AiCheckBuildRoadBridgeHere(AiRoadFinder *arf, TileIndex tile, } // Is building a (rail)bridge possible at this place (type doesn't matter)? - if (CmdFailed(DoCommand(tile_new, tile, 0x8000, DC_AUTO, CMD_BUILD_BRIDGE))) + if (CmdFailed(DoCommand(tile_new, tile, ((0x80 | ROADTYPES_ROAD) << 8), DC_AUTO, CMD_BUILD_BRIDGE))) return; AiBuildRoadRecursive(arf, tile_new, dir2); @@ -3038,13 +3038,13 @@ do_some_terraform: */ for (i = 10; i != 0; i--) { if (CheckBridge_Stuff(i, bridge_len)) { - int32 cost = DoCommand(tile, p->ai.cur_tile_a, i + (0x80 << 8), DC_AUTO, CMD_BUILD_BRIDGE); + int32 cost = DoCommand(tile, p->ai.cur_tile_a, i + ((0x80 | ROADTYPES_ROAD) << 8), DC_AUTO, CMD_BUILD_BRIDGE); if (!CmdFailed(cost) && cost < (p->player_money >> 5)) break; } } // Build it - DoCommand(tile, p->ai.cur_tile_a, i + (0x80 << 8), DC_AUTO | DC_EXEC, CMD_BUILD_BRIDGE); + DoCommand(tile, p->ai.cur_tile_a, i + ((0x80 | ROADTYPES_ROAD) << 8), DC_AUTO | DC_EXEC, CMD_BUILD_BRIDGE); p->ai.state_counter = 0; } else if (arf.best_ptr[0] & 0x40) { diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 2f7b0158c..cc790a3d0 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1096,7 +1096,7 @@ build_road_and_exit: do { byte bridge_type = RandomRange(MAX_BRIDGES - 1); if (CheckBridge_Stuff(bridge_type, bridge_len)) { - if (!CmdFailed(DoCommand(tile, tmptile, 0x8000 + bridge_type, DC_EXEC | DC_AUTO, CMD_BUILD_BRIDGE))) + if (!CmdFailed(DoCommand(tile, tmptile, bridge_type | ((0x80 | ROADTYPES_ROAD) << 8), DC_EXEC | DC_AUTO, CMD_BUILD_BRIDGE))) _grow_town_result = -1; /* obviously, if building any bridge would fail, there is no need to try other bridge-types */ |