summaryrefslogtreecommitdiff
path: root/ai/default
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-03-16 15:16:27 +0000
committertron <tron@openttd.org>2006-03-16 15:16:27 +0000
commitb8da06ddb11f234451864e0b454163ebb546e4cd (patch)
tree79a0e9518fd43cbe914bddcaebf4983201598bc8 /ai/default
parentd6134455a5aaa7b247545886be573a555cdfc2be (diff)
downloadopenttd-b8da06ddb11f234451864e0b454163ebb546e4cd.tar.xz
(svn r3907) Replace many bridge related direct map accesses with calls to shiny new functions and mark some strange constructs with XXX
Diffstat (limited to 'ai/default')
-rw-r--r--ai/default/default.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ai/default/default.c b/ai/default/default.c
index c5d463e45..5d481b7e1 100644
--- a/ai/default/default.c
+++ b/ai/default/default.c
@@ -2157,8 +2157,7 @@ static bool AiRemoveTileAndGoForward(Player *p)
return true;
}
- if (!(_m[tile].m5 & 0x40)) {
-
+ if (IsBridgeRamp(tile)) {
// Check if the bridge points in the right direction.
// This is not really needed the first place AiRemoveTileAndGoForward is called.
if (DiagDirToAxis(GetBridgeRampDirection(tile)) != (p->ai.cur_dir_a & 1U)) return false;
@@ -3669,8 +3668,12 @@ pos_3:
CMD_REMOVE_ROAD);
}
} else if (IsTileType(tile, MP_TUNNELBRIDGE)) {
- if (!IsTileOwner(tile, _current_player) || (_m[tile].m5 & 0xC6) != 0x80)
+ if (!IsTileOwner(tile, _current_player) ||
+ !IsBridge(tile) ||
+ !IsBridgeRamp(tile) ||
+ GetBridgeTransportType(tile) != TRANSPORT_RAIL) {
return;
+ }
m5 = 0;