dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mismatch between struct Blitter and class Blitter declarations

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-02-04 18:22:37 +00:00
parent 77772725be
commit 5b894edde8
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gfx_func.h
View File

@@ -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 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 GfxFillRect(int left, int top, int right, int bottom, int colour, FillRectMode mode = FILLRECT_OPAQUE);
void GfxFillPolygon(const std::vector<Point> &shape, int colour, FillRectMode mode = FILLRECT_OPAQUE, GfxFillRectModeFunctor *fill_functor = nullptr); void GfxFillPolygon(const std::vector<Point> &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 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 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); void DrawRectOutline(const Rect &r, int colour, int width = 1, int dash = 0);

10
src/linkgraph/linkgraph_gui.h
View File

@@ -84,7 +84,7 @@ public:
bool CacheStillValid() const; bool CacheStillValid() const;
void MarkStationViewportLinksDirty(const Station *st); void MarkStationViewportLinksDirty(const Station *st);
void PrepareDraw(); 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 SetCargoMask(CargoTypes cargo_mask);
void SetCompanyMask(CompanyMask company_mask); void SetCompanyMask(CompanyMask company_mask);
@@ -117,15 +117,15 @@ protected:
Point GetStationMiddle(const Station *st) const; Point GetStationMiddle(const Station *st) const;
void RefreshDrawCache(); void RefreshDrawCache();
void DrawLinks(struct Blitter *blitter, const DrawPixelInfo *dpi) const; void DrawLinks(class Blitter *blitter, const DrawPixelInfo *dpi) const;
void DrawStationDots(struct Blitter *blitter, const DrawPixelInfo *dpi) const; void DrawStationDots(class Blitter *blitter, const DrawPixelInfo *dpi) const;
void DrawContent(struct Blitter *blitter, const DrawPixelInfo *dpi, Point pta, Point ptb, const LinkProperties &cargo) 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 IsLinkVisible(Point pta, Point ptb, const DrawPixelInfo *dpi, int padding = 0) const;
bool IsPointVisible(Point pt, 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; 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 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(); void ShowLinkGraphLegend();