mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16760) -Codechange: make UpdateStationVirtCoord a function of Station

release/1.0
rubidium 2009-07-07 16:43:58 +00:00
parent e26e7c4731
commit fbb2fb9720
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/station_base.h
View File

@ -161,6 +161,8 @@ public:
*/ */
void MarkTilesDirty(bool cargo_change) const; void MarkTilesDirty(bool cargo_change) const;
void UpdateVirtCoord();
uint GetPlatformLength(TileIndex tile, DiagDirection dir) const; uint GetPlatformLength(TileIndex tile, DiagDirection dir) const;
uint GetPlatformLength(TileIndex tile) const; uint GetPlatformLength(TileIndex tile) const;
void RecomputeIndustriesNear(); void RecomputeIndustriesNear();

24
src/station_cmd.cpp
View File

@ -366,19 +366,21 @@ static Station *GetClosestDeletedStation(TileIndex tile)
return best_station; return best_station;
} }
/** Update the virtual coords needed to draw the station sign. /**
* @param st Station to update for. * Update the virtual coords needed to draw the station sign and
* mark the station sign dirty.
* @ingroup dirty
*/ */
static void UpdateStationVirtCoord(Station *st) void Station::UpdateVirtCoord()
{ {
Point pt = RemapCoords2(TileX(st->xy) * TILE_SIZE, TileY(st->xy) * TILE_SIZE); Point pt = RemapCoords2(TileX(this->xy) * TILE_SIZE, TileY(this->xy) * TILE_SIZE);
pt.y -= 32; pt.y -= 32;
if ((st->facilities & FACIL_AIRPORT) && st->airport_type == AT_OILRIG) pt.y -= 16; if ((this->facilities & FACIL_AIRPORT) && this->airport_type == AT_OILRIG) pt.y -= 16;
SetDParam(0, st->index); SetDParam(0, this->index);
SetDParam(1, st->facilities); SetDParam(1, this->facilities);
UpdateViewportSignPos(&st->sign, pt.x, pt.y, STR_STATION_SIGN); UpdateViewportSignPos(&this->sign, pt.x, pt.y, STR_STATION_SIGN);
} }
/** Update the virtual coords needed to draw the station sign for all stations. */ /** Update the virtual coords needed to draw the station sign for all stations. */
@ -387,7 +389,7 @@ void UpdateAllStationVirtCoord()
Station *st; Station *st;
FOR_ALL_STATIONS(st) { FOR_ALL_STATIONS(st) {
UpdateStationVirtCoord(st); st->UpdateVirtCoord();
} }
} }
@ -402,7 +404,7 @@ void UpdateAllStationVirtCoord()
static void UpdateStationVirtCoordDirty(Station *st) static void UpdateStationVirtCoordDirty(Station *st)
{ {
st->MarkDirty(); st->MarkDirty();
UpdateStationVirtCoord(st); st->UpdateVirtCoord();
st->MarkDirty(); st->MarkDirty();
} }
@ -2819,7 +2821,7 @@ CommandCost CmdRenameStation(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
free(st->name); free(st->name);
st->name = reset ? NULL : strdup(text); st->name = reset ? NULL : strdup(text);
UpdateStationVirtCoord(st); st->UpdateVirtCoord();
InvalidateWindowData(WC_STATION_LIST, st->owner, 1); InvalidateWindowData(WC_STATION_LIST, st->owner, 1);
MarkWholeScreenDirty(); MarkWholeScreenDirty();
} }