From b8da06ddb11f234451864e0b454163ebb546e4cd Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 16 Mar 2006 15:16:27 +0000 Subject: (svn r3907) Replace many bridge related direct map accesses with calls to shiny new functions and mark some strange constructs with XXX --- ai/default/default.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'ai/default') 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; -- cgit v1.2.3-70-g09d2