dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rubidium
2009-07-25 10:39:58 +00:00
parent 58563eafa7
commit def31de3c1
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)