Mercurial > hg > openttd

changeset 11692:17535de5f36c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r16077) -Cleanup (r14456): Remove some code that is only used for some assertions, that haven't been triggered for a while.
author frosch <frosch@openttd.org>
date Sat, 18 Apr 2009 11:08:10 +0000
parents 2a2976f77c48
children 96fd0169a7a5
files src/station_cmd.cpp
diffstat 1 files changed, 4 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -538,17 +538,6 @@
 	}
 }
 
-static inline void MergePoint(Rect *rect, TileIndex tile)
-{
-	int x = TileX(tile);
-	int y = TileY(tile);
-
-	if (rect->left   > x) rect->left   = x;
-	if (rect->bottom > y) rect->bottom = y;
-	if (rect->right  < x) rect->right  = x;
-	if (rect->top    < y) rect->top    = y;
-}
-
 /** Update the acceptance for a station.
  * @param st Station to update
  * @param show_msg controls whether to display a message that acceptance was changed.
@@ -558,56 +547,17 @@
 	/* Don't update acceptance for a buoy */
 	if (st->IsBuoy()) return;
 
-	Rect rect;
-	rect.left   = MapSizeX();
-	rect.bottom = MapSizeY();
-	rect.right  = 0;
-	rect.top    = 0;
-
 	/* old accepted goods types */
 	uint old_acc = GetAcceptanceMask(st);
 
-	/* Put all the tiles that span an area in the table. */
-	if (st->train_tile != INVALID_TILE) {
-		MergePoint(&rect, st->train_tile);
-		MergePoint(&rect, st->train_tile + TileDiffXY(st->trainst_w - 1, st->trainst_h - 1));
-	}
-
-	if (st->airport_tile != INVALID_TILE) {
-		const AirportFTAClass *afc = st->Airport();
-
-		MergePoint(&rect, st->airport_tile);
-		MergePoint(&rect, st->airport_tile + TileDiffXY(afc->size_x - 1, afc->size_y - 1));
-	}
-
-	if (st->dock_tile != INVALID_TILE) {
-		MergePoint(&rect, st->dock_tile);
-		if (IsDockTile(st->dock_tile)) {
-			MergePoint(&rect, st->dock_tile + TileOffsByDiagDir(GetDockDirection(st->dock_tile)));
-		} // else OilRig
-	}
-
-	for (const RoadStop *rs = st->bus_stops; rs != NULL; rs = rs->next) {
-		MergePoint(&rect, rs->xy);
-	}
-
-	for (const RoadStop *rs = st->truck_stops; rs != NULL; rs = rs->next) {
-		MergePoint(&rect, rs->xy);
-	}
-
 	/* And retrieve the acceptance. */
 	AcceptedCargo accepts;
-	assert((rect.right >= rect.left) == !st->rect.IsEmpty());
-	if (rect.right >= rect.left) {
-		assert(rect.left == st->rect.left);
-		assert(rect.top == st->rect.bottom);
-		assert(rect.right == st->rect.right);
-		assert(rect.bottom == st->rect.top);
+	if (!st->rect.IsEmpty()) {
 		GetAcceptanceAroundTiles(
 			accepts,
-			TileXY(rect.left, rect.bottom),
-			rect.right - rect.left   + 1,
-			rect.top   - rect.bottom + 1,
+			TileXY(st->rect.left, st->rect.top),
+			st->rect.right  - st->rect.left + 1,
+			st->rect.bottom - st->rect.top  + 1,
 			st->GetCatchmentRadius()
 		);
 	} else {