petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r16766) -Codechange: remove station->MarkDirty. It is in all cases meant to only update the sign and not invalidate the widget; the widget would be invalidated by a call before/after the call to MarkDirty or it wouldn't make sense because e.g. the window doesn't exist anymore/yet.

Browse Source
This commit is contained in:
rubidium
2009-07-08 12:01:26 +00:00
parent 3fb1506d6d
commit 9ae07bba85
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/station.cpp
View File

@@ -75,7 +75,7 @@ Station::~Station()
} }
} }
this->MarkDirty(); this->sign.MarkDirty();
InvalidateWindowData(WC_STATION_LIST, this->owner, 0); InvalidateWindowData(WC_STATION_LIST, this->owner, 0);
DeleteWindowById(WC_STATION_VIEW, index); DeleteWindowById(WC_STATION_VIEW, index);
@@ -151,14 +151,6 @@ void Station::AddFacility(StationFacility new_facility_bit, TileIndex facil_xy)
this->build_date = _date; this->build_date = _date;
} }
void Station::MarkDirty() const
{
if (this->sign.width_normal != 0) {
InvalidateWindowWidget(WC_STATION_VIEW, index, SVW_CAPTION);
this->sign.MarkDirty();
}
}
void Station::MarkTilesDirty(bool cargo_change) const void Station::MarkTilesDirty(bool cargo_change) const
{ {
TileIndex tile = this->train_tile; TileIndex tile = this->train_tile;

7
src/station_base.h
View File

@@ -147,13 +147,6 @@ public:
void AddFacility(StationFacility new_facility_bit, TileIndex facil_xy); void AddFacility(StationFacility new_facility_bit, TileIndex facil_xy);
/**
* Mark the sign of a station dirty for repaint.
*
* @ingroup dirty
*/
void MarkDirty() const;
/** /**
* Marks the tiles of the station as dirty. * Marks the tiles of the station as dirty.
* *

4
src/station_cmd.cpp
View File

@@ -403,9 +403,9 @@ void UpdateAllStationVirtCoord()
*/ */
static void UpdateStationVirtCoordDirty(Station *st) static void UpdateStationVirtCoordDirty(Station *st)
{ {
st->MarkDirty(); st->sign.MarkDirty();
st->UpdateVirtCoord(); st->UpdateVirtCoord();
st->MarkDirty(); st->sign.MarkDirty();
} }
/** Get a mask of the cargo types that the station accepts. /** Get a mask of the cargo types that the station accepts.