mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r16948) -Codechange: some code reductions and usage of wrapper functions

This commit is contained in:
rubidium 2009-07-25 10:39:58 +00:00
parent 7440ec7a73
commit 4017439c37
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/api/ai_order.cpp
View File

@ -198,7 +198,7 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
}
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;
}
}

12
src/station_cmd.cpp
View File

@ -352,7 +352,7 @@ static Station *GetClosestDeletedStation(TileIndex tile)
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(Station *st)
*/
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)

2
src/viewport.cpp
View File

@ -1092,7 +1092,7 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
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);
}