Fix: Invalid catchment initialization if station rect is empty.

OpenTTD · Feb 19, 2019 · 786ea76 · 786ea76
1 parent cb6a8b9
commit 786ea76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/core/bitmap_type.hpp b/src/core/bitmap_type.hpp
@@ -52,6 +52,14 @@ class BitmapTileArea : Bitmap, public TileArea {
 		this->h = 0;
 	}
 
+	void Reset()
+	{
+		this->tile = INVALID_TILE;
+		this->w = 0;
+		this->h = 0;
+		this->Bitmap::Reset();
+	}
+
 	void Initialize(Rect r)
 	{
 		this->tile = TileXY(r.left, r.top);

diff --git a/src/station.cpp b/src/station.cpp
@@ -396,10 +396,12 @@ bool Station::CatchmentCoversTown(TownID t)
  */
 void Station::RecomputeCatchment()
 {
+	if (this->rect.IsEmpty()) {
+		this->catchment_tiles.Reset();
+		return;
+	}
 	this->catchment_tiles.Initialize(GetCatchmentRect());
 
-	if (this->rect.IsEmpty()) return;
-
 	/* Loop finding all station tiles */
 	TileArea ta(TileXY(this->rect.left, this->rect.top), TileXY(this->rect.right, this->rect.bottom));
 	TILE_AREA_LOOP(tile, ta) {