Skip to content

Commit 51b0677

Browse files
committed
move archive loadfileraw from public to protected
1 parent d0fc1ff commit 51b0677

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/resource/archive/Archive.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ class Archive {
3737

3838
virtual bool Open() = 0;
3939
virtual bool Close() = 0;
40-
virtual std::shared_ptr<File> LoadFileRaw(const std::string& filePath) = 0;
41-
virtual std::shared_ptr<File> LoadFileRaw(uint64_t hash) = 0;
4240

4341
protected:
4442
void SetLoaded(bool isLoaded);
4543
void SetGameVersion(uint32_t gameVersion);
4644
void IndexFile(const std::string& filePath);
45+
virtual std::shared_ptr<File> LoadFileRaw(const std::string& filePath) = 0;
46+
virtual std::shared_ptr<File> LoadFileRaw(uint64_t hash) = 0;
4747

4848
private:
4949
static std::shared_ptr<ResourceInitData> CreateDefaultResourceInitData();

src/resource/archive/O2rArchive.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ class O2rArchive : virtual public Archive {
2222

2323
bool Open();
2424
bool Close();
25+
26+
protected:
2527
std::shared_ptr<File> LoadFileRaw(const std::string& filePath);
2628
std::shared_ptr<File> LoadFileRaw(uint64_t hash);
2729

28-
protected:
2930
private:
3031
zip_t* mZipArchive;
3132
};

src/resource/archive/OtrArchive.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ class OtrArchive : virtual public Archive {
2626

2727
bool Open();
2828
bool Close();
29+
30+
protected:
2931
std::shared_ptr<File> LoadFileRaw(const std::string& filePath);
3032
std::shared_ptr<File> LoadFileRaw(uint64_t hash);
3133

32-
protected:
3334
private:
3435
HANDLE mHandle;
3536
};

0 commit comments

Comments
 (0)