mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-21 14:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

JKRStdHeap, JKRArchive match

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-09-24 12:14:12 -07:00
parent 76f4e19cdc
commit a13590ff21
7 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JKernel/JKRArchive.h
+4 -4
View File
@@ -41,8 +41,6 @@ inline u16 read_big_endian_u16(void* ptr) {
return ((u16)uptr[0] << 8) | ((u16)uptr[1]);
}
extern u32 sCurrentDirID__10JKRArchive; // JKRArchive::sCurrentDirID
class JKRArchive : public JKRFileLoader {
public:
struct SDirEntry {
@@ -118,7 +116,6 @@ public:
protected:
JKRArchive();
JKRArchive(long, EMountMode);
virtual ~JKRArchive();
public:
bool getDirEntry(SDirEntry*, u32) const;
@@ -165,6 +162,9 @@ public:
u8 getMountMode() const { return mMountMode; }
bool isFileEntry(u32 param_0) { return getFileAttribute(param_0) & 1; }
protected:
virtual ~JKRArchive();
public:
/* 0x00 */ // vtable
/* 0x04 */ // JKRFileLoader
@@ -189,7 +189,7 @@ public:
static JKRArchive* mount(void*, JKRHeap*, EMountDirection);
static JKRArchive* mount(s32, EMountMode, JKRHeap*, EMountDirection);
static void* getGlbResource(u32, const char*, JKRArchive*);
static void readTypeResource(void*, u32, u32, const char*, JKRArchive*);
static u32 readTypeResource(void*, u32, u32, const char*, JKRArchive*);
static JKRCompression convertAttrToCompressionType(u32 attr) {
#define JKRARCHIVE_ATTR_COMPRESSION 0x04
include/JSystem/JKernel/JKRArchivePri.h
-5
View File
@@ -1,5 +0,0 @@
#ifndef JKRARCHIVEPRI_H
#define JKRARCHIVEPRI_H
#endif /* JKRARCHIVEPRI_H */
include/JSystem/JKernel/JKRArchivePub.h
-5
View File
@@ -1,5 +0,0 @@
#ifndef JKRARCHIVEPUB_H
#define JKRARCHIVEPUB_H
#endif /* JKRARCHIVEPUB_H */
include/JSystem/JKernel/JKRCompArchive.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
/* vt[09] */ void removeResourceAll(void); /* override */
/* vt[10] */ bool removeResource(void*); /* override */
/* vt[15] */ u32 getExpandedResSize(const void*) const; /* override */
/* vt[15] */ u32 getExpandedResSize(const void*) const; /* override */
/* vt[16] */ void* fetchResource(SDIFileEntry*, u32*); /* override */
/* vt[17] */ void* fetchResource(void*, u32, SDIFileEntry*, u32*); /* override */