Maintenance: Resubmission of batch 9115 rebased onto main (it conflicted with 9108's CommonObject.cpp change, which it already contai

Batch #9132 by ragnarok-clanker: forced by an admin (2 lower score(s), 13 changed function(s)); checked with 22 compiled unit(s), including every includer of Source/Contents/ForbiddenWords.h, Source/Contents/Party/PartyInvitation.h, Source/File/CommonObject.h, Source/UI/Chat/UIChatRoomTitle.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Party/UIRegisterPartyWnd.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIPetInfoWnd.h.
This commit is contained in:
ragnarok-clanker 2026-11-01 02:10:48 +00:00
commit 4fd6cd3ad7
18 changed files with 82 additions and 173 deletions

View file

@ -43,31 +43,6 @@ private:
bool m_encrypted;
};
class TableBytes : public ResourceBytes {
public:
CFile file;
// INLINED
bool Open(const char* name) override {
return this->file.Open(name, 0, true, false);
}
// INLINED
const void* Data() const override {
return this->file.GetData();
}
// INLINED
int Size() const override {
return static_cast<int>(this->file.GetSize());
}
// INLINED
void Close() override {
this->file.Close();
}
};
}
// OFFSET: 0x00DE8740
@ -78,8 +53,7 @@ bool CSession::LoadMapNameTable() {
const std::uint8_t source[] = {0x52, 0x88, 0x4B, 0xB1, 0x0A, 0x62, 0x9E, 0x43, 0x5E,
0x8B, 0x57, 0x9A, 0x45, 0x7B, 0x83, 0x63, 0x3F};
thread_local EncryptedName<sizeof(source), 0x17FB0F6BFF3BE93FULL> name(source);
TableBytes file;
const bool loaded = storage.LoadTokens(tokens, name.Text(), 0, file);
const bool loaded = storage.LoadTokens(tokens, name.Text(), 0);
for (auto token = tokens.begin(); token != tokens.end(); token += 2) {
g_mapInfoMgr->AddMapDisplayName(token[0], token[1], false);