diff options
| author | Luke Street <luke.street@encounterpc.com> | 2023-09-15 00:48:57 -0400 |
|---|---|---|
| committer | Luke Street <luke.street@encounterpc.com> | 2023-09-15 00:49:02 -0400 |
| commit | 2a2b9c2f4e8dcae7934b708524bf67c22dfa5f54 (patch) | |
| tree | fc66f9ee2ce4f52a1e8ce6d3b924f595d949b086 /include/JSystem/JKernel | |
| parent | 5fb89c15d870e945444f46a0e2035bd61a510988 (diff) | |
Match & link DynamicLink.cpp
Diffstat (limited to 'include/JSystem/JKernel')
| -rw-r--r-- | include/JSystem/JKernel/JKRArchive.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index b1b6b13d..4211d3ed 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -40,7 +40,7 @@ inline u16 read_big_endian_u16(void* ptr) { return ((u16)uptr[0] << 8) | ((u16)uptr[1]); } -inline u32 JKRDecompExpandSize(u8 * pBuf) { +inline u32 JKRDecompExpandSize(u8* pBuf) { return (pBuf[4] << 0x18) | (pBuf[5] << 0x10) | (pBuf[6] << 8) | pBuf[7]; } @@ -151,10 +151,12 @@ public: /* vt[09] */ virtual void removeResourceAll(void); /* override */ /* vt[10] */ virtual bool removeResource(void*); /* override */ /* vt[11] */ virtual bool detachResource(void*); /* override */ - /* vt[12] */ virtual u32 getResSize(const void*) const; /* override */ + /* vt[12] */ virtual u32 getResSize(const void* resource) const; /* override */ /* vt[13] */ virtual u32 countFile(const char*) const; /* override */ /* vt[14] */ virtual JKRFileFinder* getFirstFile(const char*) const; /* override */ - /* vt[15] */ virtual u32 getExpandedResSize(const void*) const; + /* vt[15] */ virtual u32 getExpandedResSize(const void* resource) const { + return getResSize(resource); + } /* vt[16] */ virtual void* fetchResource(SDIFileEntry*, u32*) = 0; /* vt[17] */ virtual void* fetchResource(void*, u32, SDIFileEntry*, u32*) = 0; /* vt[18] */ virtual void setExpandSize(SDIFileEntry*, u32); @@ -163,9 +165,7 @@ public: u32 countFile() const { return mArcInfoBlock->num_file_entries; } s32 countDirectory() const { return mArcInfoBlock->num_nodes; } u8 getMountMode() const { return mMountMode; } - bool isFileEntry(u32 param_0) { - return getFileAttribute(param_0) & 1; - } + bool isFileEntry(u32 param_0) { return getFileAttribute(param_0) & 1; } public: /* 0x00 */ // vtable @@ -224,4 +224,4 @@ inline void* JKRGetTypeResource(u32 tag, const char* name, JKRArchive* arc) { return JKRArchive::getGlbResource(tag, name, arc); } -#endif
\ No newline at end of file +#endif |
