cpp/openttd-patchpack/source Changeset - r27503:592cc4011090

Changeset - r27503:592cc4011090

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Jonathan G Rennison - 13 months ago 2023-05-26 11:45:18
j.g.rennison@gmail.com

Codechange: Refactor viewport catchment overlay change handling

1 file changed with 17 insertions and 7 deletions:

src/viewport.cpp

0 comments (0 inline, 0 general)

src/viewport.cpp

➞

Show inline comments

@@ @@ -3513,6 +3513,19 @@ void MarkCatchmentTilesDirty() @@
+	}
+}
 static void SetWindowDirtyForViewportCatchment()
+{
 	if (_viewport_highlight_station != nullptr) SetWindowDirty(WC_STATION_VIEW, _viewport_highlight_station->index);
 	if (_viewport_highlight_town != nullptr) SetWindowDirty(WC_TOWN_VIEW, _viewport_highlight_town->index);
+}
 static void ClearViewportCatchment()
+{
 	MarkCatchmentTilesDirty();
 	_viewport_highlight_station = nullptr;
 	_viewport_highlight_town = nullptr;
+}
 /**
  * Select or deselect station for coverage area highlight.
  * Selecting a station will deselect a town.
@@ @@ -3521,12 +3534,10 @@ void MarkCatchmentTilesDirty() @@
  */
 void SetViewportCatchmentStation(const Station *st, bool sel)
+{
 	if (_viewport_highlight_station != nullptr) SetWindowDirty(WC_STATION_VIEW, _viewport_highlight_station->index);
 	if (_viewport_highlight_town != nullptr) SetWindowDirty(WC_TOWN_VIEW, _viewport_highlight_town->index);
 	SetWindowDirtyForViewportCatchment();
 	if (sel && _viewport_highlight_station != st) {
-		MarkCatchmentTilesDirty();
+		ClearViewportCatchment();
 		_viewport_highlight_station = st;
 		_viewport_highlight_town = nullptr;
 		MarkCatchmentTilesDirty();
 	} else if (!sel && _viewport_highlight_station == st) {
 		MarkCatchmentTilesDirty();
@@ @@ -3543,10 +3554,9 @@ void SetViewportCatchmentStation(const S @@
  */
 void SetViewportCatchmentTown(const Town *t, bool sel)
+{
 	if (_viewport_highlight_town != nullptr) SetWindowDirty(WC_TOWN_VIEW, _viewport_highlight_town->index);
 	if (_viewport_highlight_station != nullptr) SetWindowDirty(WC_STATION_VIEW, _viewport_highlight_station->index);
 	SetWindowDirtyForViewportCatchment();
 	if (sel && _viewport_highlight_town != t) {
-		_viewport_highlight_station = nullptr;
+		ClearViewportCatchment();
 		_viewport_highlight_town = t;
 		MarkWholeScreenDirty();
 	} else if (!sel && _viewport_highlight_town == t) {

0 comments (0 inline, 0 general)