Skip to content

Commit 070c793

Browse files
committed
pr comments
1 parent 2b60790 commit 070c793

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/resource/archive/ArchiveManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ std::shared_ptr<Archive> ArchiveManager::AddArchive(const std::string& archivePa
153153
archive = dynamic_pointer_cast<Archive>(std::make_shared<O2rArchive>(archivePath));
154154
} else if (StringHelper::IEquals(extension, ".otr") || StringHelper::IEquals(extension, ".mpq")) {
155155
archive = dynamic_pointer_cast<Archive>(std::make_shared<OtrArchive>(archivePath));
156-
archive->Load();
157156
} else {
158157
// Not recognized file extension, trying with o2r
159158
SPDLOG_WARN("File extension \"{}\" not recognized, trying to create an o2r archive.", extension);
160159
archive = std::make_shared<O2rArchive>(archivePath);
161160
}
162161

162+
archive->Load();
163163
return AddArchive(archive);
164164
}
165165

src/resource/archive/OtrArchive.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ bool OtrArchive::LoadRaw() {
7171
const bool opened = SFileOpenArchive(GetPath().c_str(), 0, MPQ_OPEN_READ_ONLY, &mHandle);
7272
if (opened) {
7373
SPDLOG_INFO("Opened mpq file \"{}\"", GetPath());
74-
// SFileCloseArchive(mHandle);
7574
} else {
7675
SPDLOG_ERROR("Failed to load mpq file \"{}\"", GetPath());
7776
mHandle = nullptr;

0 commit comments

Comments
 (0)