Maintenance: Link fixes (resubmission of 13274, forced). (1) Session.cpp declared the EncryptedName<14, 0xB5F3F779237315F3> construct

Batch #13284 by ragnarok-clanker: forced by an admin (0 lower score(s), 1 changed function(s)); checked with 2 compiled unit(s).
This commit is contained in:
ragnarok-clanker 2026-11-06 12:38:45 +00:00
commit a2dedd3dcd
2 changed files with 5 additions and 6 deletions

View file

@ -7070,7 +7070,7 @@ void CSession::sub_DF33B0() {
}
template <>
EncryptedName<14, 0xB5F3F779237315F3ULL>::EncryptedName(const std::uint8_t (&source)[14]);
EncryptedName<14, 0xB5F3F779237315F3ULL>::EncryptedName(const char (&source)[14]);
template <>
const char* EncryptedName<14, 0x6BC977B3B5993503ULL>::Text();
EncryptedName<14, 0x6BC977B3B5993503ULL>& PoringSuperNovice2SpriteName();
@ -8417,7 +8417,7 @@ void CSession::InitJobSpriteNames() {
jobSpriteNames[240] = name.Text();
}
{
const std::uint8_t source[] = {0x30, 0xDF, 0xC9, 0x9B, 0xB9, 0x2D, 0xAF, 0x76, 0x39, 0xAF, 0xCB, 0xE3, 0xA3, 0xF7};
const char source[] = {'\x30', '\xDF', '\xC9', '\x9B', '\xB9', '\x2D', '\xAF', '\x76', '\x39', '\xAF', '\xCB', '\xE3', '\xA3', '\xF7'};
thread_local EncryptedName<sizeof(source), 0xB5F3F779237315F3ULL> name(source);
jobSpriteNames[241] = name.Text();
}

View file

@ -23,7 +23,6 @@ namespace EquipmentProperties {
class CEquipmentPropertiesMgr {
public:
CEquipmentPropertiesMgr();
static CEquipmentPropertiesMgr* GetInstance();
void SetWindow(UIWindow* window);
void GetDescriptions(const int& group, std::list<std::string>& lines);
@ -31,7 +30,7 @@ public:
};
// INLINED
inline CEquipmentPropertiesMgr* CEquipmentPropertiesMgr::GetInstance() {
inline CEquipmentPropertiesMgr* EquipmentPropertiesMgr() {
if (g_equipmentPropertiesMgr == nullptr) {
g_equipmentPropertiesMgr = new (std::nothrow) CEquipmentPropertiesMgr;
}
@ -917,7 +916,7 @@ void EquipmentPropertiesWnd::CUIItemEquipmentPropertiesLine::Paint() {
// OFFSET: 0x00A0F1F0
// FUNCTION: fn_15167
void CUIEquipmentPropertiesWnd::Slot16() {
EquipmentProperties::CEquipmentPropertiesMgr::GetInstance()->SetWindow(this);
EquipmentProperties::EquipmentPropertiesMgr()->SetWindow(this);
}
// OFFSET: 0x00A0F270
@ -951,7 +950,7 @@ void CUIEquipmentPropertiesWnd::SetTab(const int& tab) {
this->currentTab = tab;
std::list<std::string> lines;
const int group = this->currentTab;
EquipmentProperties::CEquipmentPropertiesMgr::GetInstance()->GetDescriptions(group, lines);
EquipmentProperties::EquipmentPropertiesMgr()->GetDescriptions(group, lines);
auto* listBox = this->list;
if (listBox->data != lines) {