Skip to content

Commit d0fc1ff

Browse files
committed
remove ArchiveManager::LoadFileRaw
1 parent 0b06299 commit d0fc1ff

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

src/resource/archive/ArchiveManager.cpp

-21
Original file line numberDiff line numberDiff line change
@@ -60,27 +60,6 @@ std::shared_ptr<File> ArchiveManager::LoadFile(uint64_t hash, std::shared_ptr<Re
6060
return file;
6161
}
6262

63-
//TODO remove
64-
std::shared_ptr<File> ArchiveManager::LoadFileRaw(const std::string& filePath) {
65-
if (filePath == "") {
66-
return nullptr;
67-
}
68-
69-
return LoadFileRaw(CRC64(filePath.c_str()));
70-
}
71-
72-
std::shared_ptr<File> ArchiveManager::LoadFileRaw(uint64_t hash) {
73-
const auto archive = mFileToArchive[hash];
74-
if (archive == nullptr) {
75-
return nullptr;
76-
}
77-
78-
auto file = archive->LoadFileRaw(hash);
79-
file->Parent = archive;
80-
return file;
81-
}
82-
//ENDTODO
83-
8463
bool ArchiveManager::HasFile(const std::string& filePath) {
8564
return HasFile(CRC64(filePath.c_str()));
8665
}

src/resource/archive/ArchiveManager.h

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ class ArchiveManager {
2222
bool IsArchiveLoaded();
2323
std::shared_ptr<File> LoadFile(const std::string& filePath, std::shared_ptr<ResourceInitData> initData = nullptr);
2424
std::shared_ptr<File> LoadFile(uint64_t hash, std::shared_ptr<ResourceInitData> initData = nullptr);
25-
//TODO remove
26-
std::shared_ptr<File> LoadFileRaw(const std::string& filePath);
27-
std::shared_ptr<File> LoadFileRaw(uint64_t hash);
28-
//ENDTODO
2925
bool HasFile(const std::string& filePath);
3026
bool HasFile(uint64_t hash);
3127
std::shared_ptr<std::vector<std::string>> ListFiles(const std::string& filter);

0 commit comments

Comments
 (0)