mirror of
https://github.com/zeldaret/tp
synced 2026-08-09 02:48:21 -04:00
JKRArchive (#63)
* JKRArchivePri OK * JKRArchivePub OK * formatting * removed unused asm files and tried to fixed setExpandSize and getExpandSize Co-authored-by: Julgodis <>
This commit is contained in:
@@ -3,10 +3,9 @@
|
||||
#include "dvd/dvd.h"
|
||||
#include "global.h"
|
||||
|
||||
JKRArcFinder::JKRArcFinder(JKRArchive* archive, long startIndex, long numEntries)
|
||||
: JKRFileFinder() {
|
||||
JKRArcFinder::JKRArcFinder(JKRArchive* archive, s32 startIndex, u32 numEntries) : JKRFileFinder() {
|
||||
mArchive = archive;
|
||||
mIsAvailable = numEntries > 0;
|
||||
mIsAvailable = (s32)numEntries > 0;
|
||||
mStartIndex = startIndex;
|
||||
mEndIndex = startIndex + numEntries - 1;
|
||||
mNextIndex = mStartIndex;
|
||||
@@ -14,7 +13,7 @@ JKRArcFinder::JKRArcFinder(JKRArchive* archive, long startIndex, long numEntries
|
||||
}
|
||||
|
||||
bool JKRArcFinder::findNextFile(void) {
|
||||
JKRArchive::SDirEntry entry;
|
||||
SDirEntry entry;
|
||||
|
||||
if (mIsAvailable) {
|
||||
mIsAvailable = !(mNextIndex > mEndIndex);
|
||||
@@ -22,8 +21,8 @@ bool JKRArcFinder::findNextFile(void) {
|
||||
mIsAvailable = mArchive->getDirEntry(&entry, mNextIndex);
|
||||
mEntryName = entry.name;
|
||||
mEntryFileIndex = mNextIndex;
|
||||
mEntryId = entry.id;
|
||||
mEntryTypeFlags = entry.type_flags;
|
||||
mEntryId = entry.other.id;
|
||||
mEntryTypeFlags = entry.other.flags;
|
||||
mIsFileOrDirectory = (mEntryTypeFlags >> 1) & 1;
|
||||
mNextIndex++;
|
||||
}
|
||||
@@ -63,7 +62,7 @@ bool JKRDvdFinder::findNextFile(void) {
|
||||
|
||||
if (mIsAvailable) {
|
||||
mIsFileOrDirectory = directoryEntry.is_directory != 0;
|
||||
mEntryName = directoryEntry.name;
|
||||
mEntryNameOffset = directoryEntry.name;
|
||||
mEntryFileIndex = directoryEntry.entry_number;
|
||||
mEntryId = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user