# HG changeset patch # User rubidium # Date 2009-07-25 10:39:58 # Node ID e56066b7af184df7e59766cdb0bab69622a13882 # Parent 5e5dd00d1e9333f6bdd9ea366b1966fe22fe15d0 (svn r16948) -Codechange: some code reductions and usage of wrapper functions diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp --- a/src/ai/api/ai_order.cpp +++ b/src/ai/api/ai_order.cpp @@ -198,7 +198,7 @@ static const Order *ResolveOrder(Vehicle } return INVALID_TILE; } - case OT_GOTO_WAYPOINT: return v->type == VEH_TRAIN ? ::Waypoint::Get(order->GetDestination())->xy : ::Station::Get(order->GetDestination())->xy; + case OT_GOTO_WAYPOINT: return ::Waypoint::Get(order->GetDestination())->xy; default: return INVALID_TILE; } } diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -352,7 +352,7 @@ static Station *GetClosestDeletedStation Station *st; FOR_ALL_STATIONS(st) { - if (st->facilities == 0 && st->owner == _current_company) { + if (!st->IsInUse() && st->owner == _current_company) { uint cur_dist = DistanceManhattan(tile, st->xy); if (cur_dist < threshold) { @@ -420,11 +420,7 @@ void UpdateAllStationVirtCoords() { BaseStation *st; - FOR_ALL_STATIONS(st) { - st->UpdateVirtCoord(); - } - - FOR_ALL_WAYPOINTS(st) { + FOR_ALL_BASE_STATIONS(st) { st->UpdateVirtCoord(); } } @@ -628,7 +624,7 @@ static void UpdateStationSignCoord(Stati */ static void DeleteStationIfEmpty(Station *st) { - if (st->facilities == 0) { + if (!st->IsInUse()) { st->delete_ctr = 0; InvalidateWindowData(WC_STATION_LIST, st->owner, 0); } @@ -2951,7 +2947,7 @@ void DeleteOilRig(TileIndex tile) st->UpdateVirtCoord(); st->RecomputeIndustriesNear(); - if (st->facilities == 0) delete st; + if (!st->IsInUse()) delete st; } static void ChangeTileOwner_Station(TileIndex tile, Owner old_owner, Owner new_owner) diff --git a/src/viewport.cpp b/src/viewport.cpp --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -1092,7 +1092,7 @@ static void ViewportAddTownNames(DrawPix static void AddStation(const Station *st, StringID str, uint16 width) { - AddStringToDraw(st->sign.left + 1, st->sign.top + 1, str, st->index, st->facilities, (st->owner == OWNER_NONE || st->facilities == 0) ? 0xE : _company_colours[st->owner], width); + AddStringToDraw(st->sign.left + 1, st->sign.top + 1, str, st->index, st->facilities, (st->owner == OWNER_NONE || !st->IsInUse()) ? 0xE : _company_colours[st->owner], width); }