mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Rename classes with snakes OpenRCT2/A*-F* (#19215)

Browse Source 
* Rename classes with snakes OpenRCT2/A*-F*

* Clang format files
This commit is contained in:
Duncan
2023-01-19 08:16:44 +00:00
committed by GitHub
parent 59736ecfbc
commit 859b071ddc
209 changed files with 932 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/openrct2/drawing/Drawing.String.cpp
View File

@@ -269,8 +269,7 @@ int32_t GfxWrapString(utf8* text, int32_t width, FontStyle fontStyle, int32_t* o
/**
* Draws text that is left aligned and vertically centred.
*/
void GfxDrawStringLeftCentred(
rct_drawpixelinfo* dpi, StringId format, void* args, colour_t colour, const ScreenCoordsXY& coords)
void GfxDrawStringLeftCentred(DrawPixelInfo* dpi, StringId format, void* args, colour_t colour, const ScreenCoordsXY& coords)
{
char buffer[CommonTextBufferSize];
auto bufferPtr = buffer;
@@ -285,7 +284,7 @@ void GfxDrawStringLeftCentred(
static void ColourCharacter(uint8_t colour, const uint16_t* current_font_flags, uint8_t* palette_pointer)
{
int32_t colour32 = 0;
const rct_g1_element* g1 = GfxGetG1Element(SPR_TEXT_PALETTE);
const G1Element* g1 = GfxGetG1Element(SPR_TEXT_PALETTE);
if (g1 != nullptr)
{
uint32_t idx = (colour & 0xFF) * 4;
@@ -334,8 +333,7 @@ static void ColourCharacterWindow(uint8_t colour, const uint16_t* current_font_f
* text : esi
* dpi : edi
*/
void DrawStringCentredRaw(
rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t numLines, char* text, FontStyle fontStyle)
void DrawStringCentredRaw(DrawPixelInfo* dpi, const ScreenCoordsXY& coords, int32_t numLines, char* text, FontStyle fontStyle)
{
ScreenCoordsXY screenCoords(dpi->x, dpi->y);
GfxDrawString(dpi, screenCoords, "", { COLOUR_BLACK, fontStyle });
@@ -430,7 +428,7 @@ int32_t StringGetHeightRaw(std::string_view text, FontStyle fontStyle)
* ticks : ebp >> 16
*/
void DrawNewsTicker(
rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, colour_t colour, StringId format, void* args,
DrawPixelInfo* dpi, const ScreenCoordsXY& coords, int32_t width, colour_t colour, StringId format, void* args,
int32_t ticks)
{
int32_t numLines, lineHeight, lineY;
@@ -487,7 +485,7 @@ void DrawNewsTicker(
}
}
struct text_draw_info
struct TextDrawInfo
{
int32_t startX;
int32_t startY;
@@ -501,7 +499,7 @@ struct text_draw_info
const int8_t* y_offset;
};
static void TTFDrawCharacterSprite(rct_drawpixelinfo* dpi, int32_t codepoint, text_draw_info* info)
static void TTFDrawCharacterSprite(DrawPixelInfo* dpi, int32_t codepoint, TextDrawInfo* info)
{
int32_t characterWidth = FontSpriteGetCodepointWidth(info->FontStyle, codepoint);
auto sprite = FontSpriteGetCodepointSprite(info->FontStyle, codepoint);
@@ -521,7 +519,7 @@ static void TTFDrawCharacterSprite(rct_drawpixelinfo* dpi, int32_t codepoint, te
info->x += characterWidth;
}
static void TTFDrawStringRawSprite(rct_drawpixelinfo* dpi, std::string_view text, text_draw_info* info)
static void TTFDrawStringRawSprite(DrawPixelInfo* dpi, std::string_view text, TextDrawInfo* info)
{
CodepointView codepoints(text);
for (auto codepoint : codepoints)
@@ -533,7 +531,7 @@ static void TTFDrawStringRawSprite(rct_drawpixelinfo* dpi, std::string_view text
#ifndef NO_TTF
static int _ttfGlId = 0;
static void TTFDrawStringRawTTF(rct_drawpixelinfo* dpi, std::string_view text, text_draw_info* info)
static void TTFDrawStringRawTTF(DrawPixelInfo* dpi, std::string_view text, TextDrawInfo* info)
{
if (!TTFInitialise())
return;
@@ -709,7 +707,7 @@ static void TTFDrawStringRawTTF(rct_drawpixelinfo* dpi, std::string_view text, t
#endif // NO_TTF
static void TTFProcessFormatCode(rct_drawpixelinfo* dpi, const FmtString::token& token, text_draw_info* info)
static void TTFProcessFormatCode(DrawPixelInfo* dpi, const FmtString::Token& token, TextDrawInfo* info)
{
switch (token.kind)
{
@@ -813,7 +811,7 @@ static bool ShouldUseSpriteForCodepoint(char32_t codepoint)
}
#endif // NO_TTF
static void TTFProcessStringLiteral(rct_drawpixelinfo* dpi, std::string_view text, text_draw_info* info)
static void TTFProcessStringLiteral(DrawPixelInfo* dpi, std::string_view text, TextDrawInfo* info)
{
#ifndef NO_TTF
bool isTTF = info->flags & TEXT_DRAW_FLAG_TTF;
@@ -875,14 +873,14 @@ static void TTFProcessStringLiteral(rct_drawpixelinfo* dpi, std::string_view tex
#endif // NO_TTF
}
static void TTFProcessStringCodepoint(rct_drawpixelinfo* dpi, codepoint_t codepoint, text_draw_info* info)
static void TTFProcessStringCodepoint(DrawPixelInfo* dpi, codepoint_t codepoint, TextDrawInfo* info)
{
char buffer[8]{};
UTF8WriteCodepoint(buffer, codepoint);
TTFProcessStringLiteral(dpi, buffer, info);
}
static void TTFProcessString(rct_drawpixelinfo* dpi, std::string_view text, text_draw_info* info)
static void TTFProcessString(DrawPixelInfo* dpi, std::string_view text, TextDrawInfo* info)
{
if (info->flags & TEXT_DRAW_FLAG_NO_FORMATTING)
{
@@ -914,7 +912,7 @@ static void TTFProcessString(rct_drawpixelinfo* dpi, std::string_view text, text
}
}
static void TTFProcessInitialColour(int32_t colour, text_draw_info* info)
static void TTFProcessInitialColour(int32_t colour, TextDrawInfo* info)
{
if (colour != TEXT_COLOUR_254 && colour != TEXT_COLOUR_255)
{
@@ -970,13 +968,13 @@ static void TTFProcessInitialColour(int32_t colour, text_draw_info* info)
}
void TTFDrawString(
rct_drawpixelinfo* dpi, const_utf8string text, int32_t colour, const ScreenCoordsXY& coords, bool noFormatting,
DrawPixelInfo* dpi, const_utf8string text, int32_t colour, const ScreenCoordsXY& coords, bool noFormatting,
FontStyle fontStyle, TextDarkness darkness)
{
if (text == nullptr)
return;
text_draw_info info;
TextDrawInfo info;
info.FontStyle = fontStyle;
info.flags = 0;
info.startX = coords.x;
@@ -1013,7 +1011,7 @@ void TTFDrawString(
static int32_t TTFGetStringWidth(std::string_view text, FontStyle fontStyle, bool noFormatting)
{
text_draw_info info;
TextDrawInfo info;
info.FontStyle = fontStyle;
info.flags = 0;
info.startX = 0;
@@ -1044,10 +1042,10 @@ static int32_t TTFGetStringWidth(std::string_view text, FontStyle fontStyle, boo
* rct2: 0x00682F28
*/
void GfxDrawStringWithYOffsets(
rct_drawpixelinfo* dpi, const utf8* text, int32_t colour, const ScreenCoordsXY& coords, const int8_t* yOffsets,
DrawPixelInfo* dpi, const utf8* text, int32_t colour, const ScreenCoordsXY& coords, const int8_t* yOffsets,
bool forceSpriteFont, FontStyle fontStyle)
{
text_draw_info info;
TextDrawInfo info;
info.FontStyle = fontStyle;
info.flags = 0;
info.startX = coords.x;