(svn r16962) -Codechange: more work towards multi tile waypoints

This commit is contained in:
rubidium
2009-07-26 16:17:49 +00:00
parent 297c521b6f
commit 66bca52949
5 changed files with 51 additions and 34 deletions

View File

@@ -39,7 +39,6 @@ BaseStation::~BaseStation()
Station::Station(TileIndex tile) :
SpecializedStation<Station, false>(tile),
train_station(INVALID_TILE, 0, 0),
airport_tile(INVALID_TILE),
dock_tile(INVALID_TILE),
indtype(IT_INVALID),
@@ -423,7 +422,7 @@ bool StationRect::BeforeAddRect(TileIndex tile, int w, int h, StationRectMode mo
return false;
}
bool StationRect::AfterRemoveTile(Station *st, TileIndex tile)
bool StationRect::AfterRemoveTile(BaseStation *st, TileIndex tile)
{
int x = TileX(tile);
int y = TileY(tile);
@@ -473,7 +472,7 @@ bool StationRect::AfterRemoveTile(Station *st, TileIndex tile)
return false; // non-empty remaining rect
}
bool StationRect::AfterRemoveRect(Station *st, TileIndex tile, int w, int h)
bool StationRect::AfterRemoveRect(BaseStation *st, TileIndex tile, int w, int h)
{
assert(PtInExtendedRect(TileX(tile), TileY(tile)));
assert(PtInExtendedRect(TileX(tile) + w - 1, TileY(tile) + h - 1));