Merge branch 'master' into jgrpp
# Conflicts: # src/industry_gui.cpp # src/lang/korean.txt # src/town.h # src/town_gui.cpp
This commit is contained in:
@@ -118,6 +118,7 @@ int DrawStringMultiLine(int left, int right, int top, int bottom, StringID str,
|
||||
void DrawCharCentered(uint32 c, int x, int y, TextColour colour);
|
||||
|
||||
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);
|
||||
void GfxDrawLine(int left, int top, int right, int bottom, int colour, int width = 1, int dash = 0);
|
||||
void DrawBox(int x, int y, int dx1, int dy1, int dx2, int dy2, int dx3, int dy3);
|
||||
|
||||
|
Reference in New Issue
Block a user