From 5b894edde8470be3966fb286bb9550f981dca4db Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 4 Feb 2024 18:22:37 +0000 Subject: [PATCH] Fix mismatch between struct Blitter and class Blitter declarations --- src/gfx_func.h | 4 ++-- src/linkgraph/linkgraph_gui.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gfx_func.h b/src/gfx_func.h index 0c68acb2d1..ba974ac91d 100644 --- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -117,10 +117,10 @@ int DrawStringMultiLine(int left, int right, int top, int bottom, StringID str, void DrawCharCentered(char32_t c, const Rect &r, TextColour colour); -void GfxFillRect(struct Blitter *blitter, const DrawPixelInfo *dpi, int left, int top, int right, int bottom, int colour, FillRectMode mode = FILLRECT_OPAQUE); +void GfxFillRect(class Blitter *blitter, const DrawPixelInfo *dpi, int left, int top, int right, int bottom, int colour, FillRectMode mode = FILLRECT_OPAQUE); void GfxFillRect(int left, int top, int right, int bottom, int colour, FillRectMode mode = FILLRECT_OPAQUE); void GfxFillPolygon(const std::vector &shape, int colour, FillRectMode mode = FILLRECT_OPAQUE, GfxFillRectModeFunctor *fill_functor = nullptr); -void GfxDrawLine(struct Blitter * blitter, const DrawPixelInfo *dpi, int left, int top, int right, int bottom, int colour, int width = 1, int dash = 0); +void GfxDrawLine(class Blitter * blitter, const DrawPixelInfo *dpi, int left, int top, int right, int bottom, int colour, int width = 1, int dash = 0); void GfxDrawLine(int left, int top, int right, int bottom, int colour, int width = 1, int dash = 0); void DrawBox(const DrawPixelInfo *dpi, int x, int y, int dx1, int dy1, int dx2, int dy2, int dx3, int dy3); void DrawRectOutline(const Rect &r, int colour, int width = 1, int dash = 0); diff --git a/src/linkgraph/linkgraph_gui.h b/src/linkgraph/linkgraph_gui.h index 73ca5e27f0..9fa6c32914 100644 --- a/src/linkgraph/linkgraph_gui.h +++ b/src/linkgraph/linkgraph_gui.h @@ -84,7 +84,7 @@ public: bool CacheStillValid() const; void MarkStationViewportLinksDirty(const Station *st); void PrepareDraw(); - void Draw(struct Blitter *blitter, const DrawPixelInfo *dpi) const; + void Draw(class Blitter *blitter, const DrawPixelInfo *dpi) const; void SetCargoMask(CargoTypes cargo_mask); void SetCompanyMask(CompanyMask company_mask); @@ -117,15 +117,15 @@ protected: Point GetStationMiddle(const Station *st) const; void RefreshDrawCache(); - void DrawLinks(struct Blitter *blitter, const DrawPixelInfo *dpi) const; - void DrawStationDots(struct Blitter *blitter, const DrawPixelInfo *dpi) const; - void DrawContent(struct Blitter *blitter, const DrawPixelInfo *dpi, Point pta, Point ptb, const LinkProperties &cargo) const; + void DrawLinks(class Blitter *blitter, const DrawPixelInfo *dpi) const; + void DrawStationDots(class Blitter *blitter, const DrawPixelInfo *dpi) const; + void DrawContent(class Blitter *blitter, const DrawPixelInfo *dpi, Point pta, Point ptb, const LinkProperties &cargo) const; bool IsLinkVisible(Point pta, Point ptb, const DrawPixelInfo *dpi, int padding = 0) const; bool IsPointVisible(Point pt, const DrawPixelInfo *dpi, int padding = 0) const; void GetWidgetDpi(DrawPixelInfo *dpi, uint margin = 0) const; static void AddStats(CargoID new_cargo, uint new_cap, uint new_usg, uint new_plan, uint32_t time, bool new_shared, LinkProperties &cargo); - static void DrawVertex(struct Blitter *blitter, const DrawPixelInfo *dpi, int x, int y, int size, int colour, int border_colour); + static void DrawVertex(class Blitter *blitter, const DrawPixelInfo *dpi, int x, int y, int size, int colour, int border_colour); }; void ShowLinkGraphLegend();