cpp/openttd-patchpack/source Changeset - r27046:c2f7a2f09be4

Changeset - r27046:c2f7a2f09be4

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

Peter Nelson - 17 months ago 2023-04-07 09:12:29
peter1138@openttd.org

Codechange: Use correct type for linkgraph company mask.

4 files changed with 9 insertions and 9 deletions:

src/linkgraph/linkgraph_gui.cpp

src/linkgraph/linkgraph_gui.h

src/smallmap_gui.cpp

src/smallmap_gui.h

0 comments (0 inline, 0 general)

src/linkgraph/linkgraph_gui.cpp

➞

Show inline comments

@@ @@ -444,7 +444,7 @@ void LinkGraphOverlay::SetCargoMask(Carg @@
  * Set a new company mask and rebuild the cache.
  * @param company_mask New company mask.
  */
-void LinkGraphOverlay::SetCompanyMask(uint32 company_mask)
+void LinkGraphOverlay::SetCompanyMask(CompanyMask company_mask)
+{
 	this->company_mask = company_mask;
 	this->RebuildCache();
@@ @@ -564,7 +564,7 @@ LinkGraphLegendWindow::LinkGraphLegendWi @@
  */
 void LinkGraphLegendWindow::SetOverlay(std::shared_ptr<LinkGraphOverlay> overlay) {
 	this->overlay = overlay;
-	uint32 companies = this->overlay->GetCompanyMask();
+	CompanyMask companies = this->overlay->GetCompanyMask();
 	for (uint c = 0; c < MAX_COMPANIES; c++) {
 		if (!this->IsWidgetDisabled(WID_LGL_COMPANY_FIRST + c)) {
 			this->SetWidgetLoweredState(WID_LGL_COMPANY_FIRST + c, HasBit(companies, c));

src/linkgraph/linkgraph_gui.h

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ public: @@
 	 * @param company_mask Bitmask of companies to be shown.
 	 * @param scale Desired thickness of lines and size of station dots.
 	 */
-	LinkGraphOverlay(Window *w, uint wid, CargoTypes cargo_mask, uint32 company_mask, uint scale) :
+	LinkGraphOverlay(Window *w, uint wid, CargoTypes cargo_mask, CompanyMask company_mask, uint scale) :
 			window(w), widget_id(wid), cargo_mask(cargo_mask), company_mask(company_mask), scale(scale)
 	{}
 	void Draw(const DrawPixelInfo *dpi);
 	void SetCargoMask(CargoTypes cargo_mask);
-	void SetCompanyMask(uint32 company_mask);
+	void SetCompanyMask(CompanyMask company_mask);
 	bool ShowTooltip(Point pt, TooltipCloseCondition close_cond);
@@ @@ -73,13 +73,13 @@ public: @@
 	CargoTypes GetCargoMask() { return this->cargo_mask; }
 	/** Get a bitmask of the currently shown companies. */
-	uint32 GetCompanyMask() { return this->company_mask; }
+	CompanyMask GetCompanyMask() { return this->company_mask; }
 protected:
 	Window *window;                    ///< Window to be drawn into.
 	const uint widget_id;              ///< ID of Widget in Window to be drawn to.
 	CargoTypes cargo_mask;             ///< Bitmask of cargos to be displayed.
-	uint32 company_mask;               ///< Bitmask of companies to be displayed.
+	CompanyMask company_mask;          ///< Bitmask of companies to be displayed.
 	LinkMap cached_links;              ///< Cache for links to reduce recalculation.
 	StationSupplyList cached_stations; ///< Cache for stations to be drawn.
 	uint scale;                        ///< Width of link lines.

src/smallmap_gui.cpp

➞

Show inline comments

@@ @@ -1594,7 +1594,7 @@ int SmallMapWindow::GetPositionOnLegend( @@
 	if (!this->refresh.Elapsed(delta_ms)) return;
 	if (this->map_type == SMT_LINKSTATS) {
-		uint32 company_mask = this->GetOverlayCompanyMask();
+		CompanyMask company_mask = this->GetOverlayCompanyMask();
 		if (this->overlay->GetCompanyMask() != company_mask) {
 			this->overlay->SetCompanyMask(company_mask);
 		} else {

src/smallmap_gui.h

➞

Show inline comments

@@ @@ -151,9 +151,9 @@ protected: @@
 	 * the _local_company. Spectators get to see all companies' links.
 	 * @return Company mask.
 	 */
-	inline uint32 GetOverlayCompanyMask() const
+	inline CompanyMask GetOverlayCompanyMask() const
+	{
-		return Company::IsValidID(_local_company) ? 1U << _local_company : 0xffffffff;
+		return Company::IsValidID(_local_company) ? 1U << _local_company : MAX_UVALUE(CompanyMask);
+	}
 	void RebuildColourIndexIfNecessary();

0 comments (0 inline, 0 general)