Decompile 70 functions in Source/Client/Browser/BrowserFactory.cpp, Source/Contents/Emblems/EmblemUpload.cpp, ...
Batch #1665 by ragnarok-clanker: 0 byte-identical, 70 confirmed by peer review. - fn_10904 UIEditCtrl::UpdateLinks: logic confirmed by peer review - fn_10905 EditViewport::Synchronize: logic confirmed by peer review - fn_10950 UIBalloonText::SetText: logic confirmed by peer review - fn_11216 ItemLinkDisplay::Convert: logic confirmed by peer review - fn_11326 UIListBox::Slot15: logic confirmed by peer review (already on main) - fn_11327 UIListBoxEx::Slot15: logic confirmed by peer review (already on main) - fn_11366 UIListBox::Paint: logic confirmed by peer review - fn_11367 UIListBoxEx::Paint: logic confirmed by peer review - fn_11392 UITextButton::Paint: logic confirmed by peer review - fn_11394 UITextViewer::Paint: logic confirmed by peer review - fn_11445 UITextButton::Slot31: logic confirmed by peer review (already on main) - fn_11471 UITextButton::Slot27: logic confirmed by peer review (already on main) - fn_11494 UITextButton::Slot33: logic confirmed by peer review (already on main) - fn_11562 UITextViewer::SendMsg: logic confirmed by peer review (already on main) - fn_11721 UICntWnd::DrawBorder: logic confirmed by peer review (already on main) - fn_11760 UIBank_NewWnd::Paint: logic confirmed by peer review (already on main) - fn_11761 UIChatRoomWnd::Paint: logic confirmed by peer review (already on main) - fn_11767 UIMerInfoWnd::Paint: logic confirmed by peer review (already on main) - fn_12680 ShortcutPainting::Paint: logic confirmed by peer review - fn_13829 WrapPlainText: logic confirmed by peer review - fn_13833 WrapRichText: logic confirmed by peer review - fn_16941 UIWindow::DrawAmount: logic confirmed by peer review - fn_16971 UIWindow::TextHeight: logic confirmed by peer review - fn_16972 UIWindow::VerticalTextHeight: logic confirmed by peer review - fn_16973 UIWindow::TextSize: logic confirmed by peer review - fn_16974 UIWindow::VerticalTextSize: logic confirmed by peer review - fn_16975 UIWindow::TextWidth: logic confirmed by peer review - fn_16993 WrapPixelText: logic confirmed by peer review - fn_17007 FitText: logic confirmed by peer review - fn_17009 UIWindow::DrawTextAt: logic confirmed by peer review - fn_17013 DrawOutlinedColoredText: logic confirmed by peer review - fn_17014 DrawStyledColoredText: logic confirmed by peer review - fn_17015 DrawColoredText: logic confirmed by peer review - fn_17016 DrawOutlinedText: logic confirmed by peer review - fn_17136 BrowserFactory::Create: logic confirmed by peer review - fn_18376 LookupMessage: logic confirmed by peer review - fn_01934 TextContext::TextContext: logic confirmed by peer review - fn_01957 TextContext::Marker: logic confirmed by peer review - fn_01961 TextContext::Measure: logic confirmed by peer review - fn_01966 TextContext::SetFont: logic confirmed by peer review - fn_01970 TextContext::DrawPair: logic confirmed by peer review - fn_01971 TextContext::Draw: logic confirmed by peer review - fn_01983 TextContext::MeasurePart: logic confirmed by peer review - fn_01984 TextContext::DrawPart: logic confirmed by peer review - fn_21788 ReceivePartyJoinResult: logic confirmed by peer review - fn_24191 EmotionHotkeys::LoadDefaults: logic confirmed by peer review - fn_03664 CAdventurerAgencyMgr::CompletePartyInfo: logic confirmed by peer review - fn_03666 CAdventurerAgencyMgr::CompleteRegistration: logic confirmed by peer review - fn_03668 CAdventurerAgencyMgr::CompleteStopRecruiting: logic confirmed by peer review - fn_03976 CEmblemDataMgr::CompleteUpload: logic confirmed by peer review - fn_04239 CMCStoreInfoBackup::CompleteSave: logic confirmed by peer review - fn_04262 CPlayerNameDictionary::Lookup: logic confirmed by peer review - fn_06581 ItemNaming::DisplayName: logic confirmed by peer review (already on main) - fn_06583 ItemNamingContext::Element: logic confirmed by peer review (already on main) - fn_06584 ItemNamingContext::Star: logic confirmed by peer review (already on main) - fn_06585 ItemNaming::Creator: logic confirmed by peer review (already on main) - fn_06586 ItemNamingContext::Apprentice: logic confirmed by peer review (already on main) - fn_06587 ItemNaming::Suffixes: logic confirmed by peer review (already on main) - fn_06588 ItemNaming::Prefixes: logic confirmed by peer review (already on main) - fn_09299 UIApplyForPartyWnd::Slot15: logic confirmed by peer review - fn_09300 UIRegisterPartyWnd::Slot15: logic confirmed by peer review - fn_09301 UIRequestJoinPartyWnd::Slot15: logic confirmed by peer review - fn_09303 UIApplyForPartyWnd::Paint: logic confirmed by peer review - fn_09304 UIPartyInfoWnd::Paint: logic confirmed by peer review - fn_10748 UIEditCtrl::RemoveInvalidLink: logic confirmed by peer review - fn_10758 UIEditCtrl::DrawSelectionAt: logic confirmed by peer review (already on main) - fn_10759 UIEditCtrl::DrawSelection: logic confirmed by peer review (already on main) - fn_10794 UIBasicButton::Paint: logic confirmed by peer review - fn_10799 UIBmpTextButton::Paint: logic confirmed by peer review - fn_10823 UITransBalloonText::Paint: logic confirmed by peer review Reviewed-by: ragnarok-clanker
This commit is contained in:
ragnarok-clanker
parent
936b152298
commit
838c0044d2
43 changed files with 125 additions and 124 deletions
|
|
@ -2,6 +2,7 @@
|
|||
#include "Contents/Items/ItemInfo.h"
|
||||
#include "Render/Text/TextContext.h"
|
||||
#include "UI/Text/TextWrapping.h"
|
||||
#include "Utility/Text/TextTokens.h"
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
|
|
@ -13,7 +14,7 @@
|
|||
|
||||
// OFFSET: 0x009B4220
|
||||
// FUNCTION: fn_13829
|
||||
void WrapPlainText(const char* text, std::vector<std::string>& lines, int width, unsigned short codePage, bool inlineCharset) {
|
||||
void WrapPlainText(const char* text, std::vector<std::string>& lines, int width, unsigned short codePage) {
|
||||
const char* begin = text;
|
||||
const char* chunk = text;
|
||||
const char* current = text;
|
||||
|
|
@ -21,7 +22,7 @@ void WrapPlainText(const char* text, std::vector<std::string>& lines, int width,
|
|||
const unsigned bytes = static_cast<unsigned>(std::strlen(text));
|
||||
const char* end = text + bytes;
|
||||
const char* limit = text + width;
|
||||
const char* marker = text + TextContext::Marker(text, bytes, inlineCharset);
|
||||
const char* marker = text + TextContext::Marker(text, bytes);
|
||||
|
||||
while (current < end) {
|
||||
current = CharNextExA(codePage, current, 0);
|
||||
|
|
@ -47,7 +48,7 @@ void WrapPlainText(const char* text, std::vector<std::string>& lines, int width,
|
|||
lines.emplace_back(chunk, current);
|
||||
}
|
||||
|
||||
if (inlineCharset && *marker != '\0' && marker < end) {
|
||||
if (g_inlineCharset && *marker != '\0' && marker < end) {
|
||||
for (std::size_t index = 1; index < lines.size(); ++index) {
|
||||
lines[index].insert(0, marker, 3);
|
||||
}
|
||||
|
|
@ -79,7 +80,7 @@ namespace {
|
|||
// OFFSET: 0x009B4730
|
||||
// FUNCTION: fn_13833
|
||||
void WrapRichText(
|
||||
const char* text, std::vector<std::string>& lines, int width, bool carriageReturns, unsigned short codePage, bool inlineCharset, ItemDescriptions& items
|
||||
const char* text, std::vector<std::string>& lines, int width, bool carriageReturns, unsigned short codePage, ItemDescriptions& items
|
||||
) {
|
||||
const char* begin = text;
|
||||
const char* current = text;
|
||||
|
|
@ -87,7 +88,7 @@ void WrapRichText(
|
|||
const unsigned bytes = static_cast<unsigned>(std::strlen(text));
|
||||
const char* end = text + bytes;
|
||||
const char* limit = text + width;
|
||||
const char* marker = text + TextContext::Marker(text, bytes, inlineCharset);
|
||||
const char* marker = text + TextContext::Marker(text, bytes);
|
||||
|
||||
while (current < end) {
|
||||
if (carriageReturns && *current == '\r') {
|
||||
|
|
@ -194,7 +195,7 @@ void WrapRichText(
|
|||
lines.emplace_back(begin, current);
|
||||
}
|
||||
|
||||
if (inlineCharset && *marker != '\0' && marker < end) {
|
||||
if (g_inlineCharset && *marker != '\0' && marker < end) {
|
||||
for (std::size_t index = 1; index < lines.size(); ++index) {
|
||||
const unsigned position = Color(lines[index].data(), lines[index].size()) ? 7 : 0;
|
||||
lines[index].insert(position, marker, 3);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue