From 966e476df839bf259a7673a8c87f7bdf456dabce Mon Sep 17 00:00:00 2001 From: smatz Date: Thu, 17 Apr 2008 00:44:20 +0000 Subject: (svn r12745) -Codechange: a bit of naming conventions, introduce Is*DepotTile() --- src/ai/default/default.cpp | 6 +++--- src/ai/trolly/pathfinder.cpp | 2 +- src/ai/trolly/trolly.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ai') diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index 9a563e96a..430f487c9 100644 --- a/src/ai/default/default.cpp +++ b/src/ai/default/default.cpp @@ -330,7 +330,7 @@ static void AiHandleReplaceTrain(Player *p) EngineID veh; // wait until the vehicle reaches the depot. - if (!IsTileDepotType(v->tile, TRANSPORT_RAIL) || v->u.rail.track != 0x80 || !(v->vehstatus&VS_STOPPED)) { + if (!IsDepotTypeTile(v->tile, TRANSPORT_RAIL) || v->u.rail.track != 0x80 || !(v->vehstatus&VS_STOPPED)) { AiHandleGotoDepot(p, CMD_SEND_TRAIN_TO_DEPOT); return; } @@ -2886,7 +2886,7 @@ static bool AiCheckRoadFinished(Player *p) are.dest = _players_ai[p->index].cur_tile_b; tile = TILE_MASK(_players_ai[p->index].cur_tile_a + TileOffsByDiagDir(dir)); - if (IsRoadStopTile(tile) || IsTileDepotType(tile, TRANSPORT_ROAD)) return false; + if (IsRoadStopTile(tile) || IsDepotTypeTile(tile, TRANSPORT_ROAD)) return false; TrackdirBits bits = TrackStatusToTrackdirBits(GetTileTrackStatus(tile, TRANSPORT_ROAD, ROADTYPES_ROAD)) & DiagdirReachesTrackdirs(dir); if (bits == TRACKDIR_BIT_NONE) return false; @@ -3606,7 +3606,7 @@ static void AiStateSellVeh(Player *p) if (v->owner == _current_player) { if (v->type == VEH_TRAIN) { - if (!IsTileDepotType(v->tile, TRANSPORT_RAIL) || v->u.rail.track != 0x80 || !(v->vehstatus&VS_STOPPED)) { + if (!IsDepotTypeTile(v->tile, TRANSPORT_RAIL) || v->u.rail.track != 0x80 || !(v->vehstatus&VS_STOPPED)) { if (!v->current_order.IsType(OT_GOTO_DEPOT)) DoCommand(0, v->index, 0, DC_EXEC, CMD_SEND_TRAIN_TO_DEPOT); goto going_to_depot; diff --git a/src/ai/trolly/pathfinder.cpp b/src/ai/trolly/pathfinder.cpp index b2e44fd00..36bbb748a 100644 --- a/src/ai/trolly/pathfinder.cpp +++ b/src/ai/trolly/pathfinder.cpp @@ -45,7 +45,7 @@ static bool IsRoad(TileIndex tile) { return // MP_ROAD, but not a road depot? - (IsTileType(tile, MP_ROAD) && !IsTileDepotType(tile, TRANSPORT_ROAD)) || + (IsTileType(tile, MP_ROAD) && !IsDepotTypeTile(tile, TRANSPORT_ROAD)) || (IsTileType(tile, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD); } diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp index e047a5a29..8a419ca09 100644 --- a/src/ai/trolly/trolly.cpp +++ b/src/ai/trolly/trolly.cpp @@ -1254,7 +1254,7 @@ static void AiNew_CheckVehicle(Player *p, Vehicle *v) // We are already sending him back if (AiNew_GetSpecialVehicleFlag(p, v) & AI_VEHICLEFLAG_SELL) { - if (v->type == VEH_ROAD && IsTileDepotType(v->tile, TRANSPORT_ROAD) && + if (v->type == VEH_ROAD && IsDepotTypeTile(v->tile, TRANSPORT_ROAD) && (v->vehstatus&VS_STOPPED)) { // We are at the depot, sell the vehicle AI_DoCommand(0, v->index, 0, DC_EXEC, CMD_SELL_ROAD_VEH); -- cgit v1.2.3-54-g00ecf