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:
parent
05cea635c8
commit
4fd6cd3ad7
18 changed files with 82 additions and 173 deletions
|
|
@ -55,31 +55,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();
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
struct NaviUnknownBlock {
|
||||
|
|
@ -865,8 +840,7 @@ bool CSession::LoadExceptionMinimapNameTable() {
|
|||
this->m_navigationForbiddenMaps.reserve(512);
|
||||
|
||||
CCommonObject& storage = reinterpret_cast<CCommonObject&>(this->unknown_5400[0x30]);
|
||||
TableBytes file;
|
||||
const bool loaded = storage.LoadTokens(tokens, "ExceptionMinimapNameTable.txt", 0, file);
|
||||
const bool loaded = storage.LoadTokens(tokens, "ExceptionMinimapNameTable.txt", 0);
|
||||
|
||||
for (char* token : tokens) {
|
||||
this->m_navigationForbiddenMaps.push_back(std::string(token));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue