mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-22 00:26:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

oarc_manager

Browse Source
This commit is contained in:
robojumper
2024-05-29 21:45:20 +02:00
parent e6429777e5
commit 892a040a97
9 changed files with 188 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_dvd.cpp
+8 -11
View File
@@ -1,6 +1,8 @@
#include <d/d_dvd.h>
#include <m/m_dvd.h>
// clang-format off
#include <sized_string.h>
// clang-format on
namespace dDvd {
/** 800520f0 */
@@ -19,25 +21,20 @@ loader_c::loader_c() {
/** 80052130 */
loader_c::~loader_c() {}
// sprintf2
extern "C" void fn_8003D650(char *out, const char *fmt, ...);
/** 80052170 */
void *loader_c::request(const char *path, u8 mountDirection, EGG::Heap *heap) {
char buf[128];
if (mpBuffer != nullptr) {
return mpBuffer;
}
if (mpCommand == 0) {
mSize = -1;
mpHeap = heap != nullptr ? heap : mDvd::getArchiveHeap();
buf[0] = '\0';
fn_8003D650(buf, "US%s", path);
if (!mDvd::IsExistPath(buf)) {
fn_8003D650(buf, "%s", path);
SizedString<128> buf;
buf.sprintf("US%s", path);
if (!mDvd::IsExistPath(&buf)) {
buf.sprintf("%s", path);
}
mpCommand = mDvd_toMainRam_normal_c::create(buf, mountDirection, heap);
mpCommand = mDvd_toMainRam_normal_c::create(&buf, mountDirection, heap);
}
if (mpCommand != nullptr && mpCommand->mStatus != 0) {
mpBuffer = mpCommand->mDataPtr;
src/d/d_rawarchive.cpp
+13 -15
View File
@@ -120,11 +120,10 @@ bool dRawArcEntry_c::destroy(void *arg) {
bool dRawArcEntry_c::loadArcFromDiskChecked(const char *fileName, const char *dirName, u8 mountDirection,
EGG::Heap *heap) {
char arcPath[128];
arcPath[0] = '\0';
SizedString<128> path;
if (checkArcExistsOnDiskInner(arcPath, fileName, dirName)) {
return loadArcFromDisk(fileName, arcPath, mountDirection, heap);
if (checkArcExistsOnDiskInner(path, fileName, dirName)) {
return loadArcFromDisk(fileName, &path, mountDirection, heap);
}
return false;
}
@@ -138,20 +137,19 @@ bool dRawArcEntry_c::loadArcFromDisk(const char *arcName, const char *arcPath, u
return true;
}
bool dRawArcEntry_c::checkArcExistsOnDisk(const char *fileName, const char *dirName) {
char path[128];
path[0] = '\0';
BOOL dRawArcEntry_c::checkArcExistsOnDisk(const char *fileName, const char *dirName) {
SizedString<128> path;
return checkArcExistsOnDiskInner(path, fileName, dirName);
}
// sprintf2
extern "C" void fn_8003D650(char *out, const char *fmt, ...);
bool dRawArcEntry_c::checkArcExistsOnDiskInner(char *outBuf, const char *fileName, const char *dirName) {
fn_8003D650(outBuf, "/US/%s/%s.arc", dirName, fileName);
if (!mDvd::IsExistPath(outBuf)) {
fn_8003D650(outBuf, "/%s/%s.arc", dirName, fileName);
if (!mDvd::IsExistPath(outBuf)) {
BOOL dRawArcEntry_c::checkArcExistsOnDiskInner(SizedString<128> &path, const char *fileName, const char *dirName) {
path.sprintf("/US/%s/%s.arc", dirName, fileName);
if (!mDvd::IsExistPath(&path)) {
path.sprintf("/%s/%s.arc", dirName, fileName);
if (!mDvd::IsExistPath(&path)) {
return false;
}
}
@@ -249,7 +247,7 @@ bool dRawArcTable_c::init(u16 count, void *callbackArg, EGG::Heap *heap) {
return true;
}
u32 dRawArcTable_c::getArcOrLoadFromDisk(const char *name, const char *dirName, u8 mountDirection, EGG::Heap *heap) {
BOOL dRawArcTable_c::getArcOrLoadFromDisk(const char *name, const char *dirName, u8 mountDirection, EGG::Heap *heap) {
dRawArcEntry_c *entry = findEntry(name);
if (entry == nullptr) {
entry = findEmptySlot();
@@ -266,7 +264,7 @@ u32 dRawArcTable_c::getArcOrLoadFromDisk(const char *name, const char *dirName,
return true;
}
bool dRawArcTable_c::addEntryFromSuperArc(const char *name, void *data, u8 mountDirection, EGG::Heap *heap) {
BOOL dRawArcTable_c::addEntryFromSuperArc(const char *name, void *data, u8 mountDirection, EGG::Heap *heap) {
dRawArcEntry_c *entry = findEntry(name);
if (entry == nullptr) {
entry = findEmptySlot();
@@ -303,7 +301,7 @@ bool dRawArcTable_c::hasEntry(const char *name) {
return findEntry(name) != nullptr;
}
u32 dRawArcTable_c::decreaseRefCount(const char *name) {
BOOL dRawArcTable_c::decreaseRefCount(const char *name) {
dRawArcEntry_c *entry = findEntry(name);
if (entry == nullptr) {
return false;
src/toBeSorted/arc_managers/current_stage_arc_manager.cpp
-2
View File
@@ -54,8 +54,6 @@ void CurrentStageArcManager::init(EGG::Heap *heap) {
mArcTable.init(18, &lbl_80575250, heap);
}
// sprintf
extern "C" void fn_8001F820(char *str, const char *src, ...);
bool CurrentStageArcManager::setStage(const char *newStage) {
mStageName = newStage;
src/toBeSorted/arc_managers/oarc_manager.cpp
+124
View File
@@ -0,0 +1,124 @@
#include <d/d_heap.h>
#include <d/d_rawarchive.h>
#include <egg/core/eggHeap.h>
// clang-format off
#include <sized_string.h>
// clang-format on
class OarcManager {
OarcManager();
virtual ~OarcManager();
dRawArcTable_c mArcTable;
static OarcManager *sInstance;
static bool create(EGG::Heap *heap);
void init(EGG::Heap *heap);
bool checkIfObjectArcExistsOnDisk(const char *object);
bool loadObjectArcFromDisk(const char *object, EGG::Heap *heap);
bool addEntryFromSuperArc(const char *object, void *data, EGG::Heap *heap);
void ensureLoaded1(const char *object);
void ensureLoaded2(const char *object);
bool decrement(const char *path);
void *getData(const char *oarcName, const char *fileName);
void *getMdlFromArc2(const char *oarcName);
void *getMdlFromArc(const char *oarcName);
void *getZevFromArc(const char *oarcName);
void *getDzbFromArc(const char *oarcName, const char *fileName);
void *getPlcFromArc(const char *oarcName, const char *fileName);
void *getSubEntryData(const char *oarcName, const char *fileName);
};
OarcManager *OarcManager::sInstance;
OarcManager::OarcManager() {
sInstance = this;
}
OarcManager::~OarcManager() {
sInstance = nullptr;
}
extern char lbl_80575250;
void OarcManager::init(EGG::Heap *heap) {
mArcTable.init(200, &lbl_80575250, heap);
}
bool OarcManager::checkIfObjectArcExistsOnDisk(const char *object) {
return dRawArcEntry_c::checkArcExistsOnDisk(object, "Object");
}
bool OarcManager::loadObjectArcFromDisk(const char *object, EGG::Heap *heap) {
if (heap == nullptr) {
heap = dHeap::work2Heap.heap;
}
return mArcTable.getArcOrLoadFromDisk(object, "Object", 0, heap);
}
bool OarcManager::addEntryFromSuperArc(const char *object, void *data, EGG::Heap *heap) {
if (heap == nullptr) {
heap = EGG::Heap::sCurrentHeap;
}
return mArcTable.addEntryFromSuperArc(object, data, 0, heap);
}
void OarcManager::ensureLoaded1(const char *object) {
mArcTable.ensureLoadedMaybe2(object);
}
void OarcManager::ensureLoaded2(const char *object) {
mArcTable.ensureLoadedMaybe(object);
}
bool OarcManager::decrement(const char *path) {
return mArcTable.decreaseRefCount(path);
}
void *OarcManager::getData(const char *oarcName, const char *fileName) {
return mArcTable.getDataFromOarc(oarcName, fileName);
}
void *OarcManager::getMdlFromArc2(const char *oarcName) {
return mArcTable.getDataFromOarc(oarcName, "g3d/model.brres");
}
void *OarcManager::getMdlFromArc(const char *oarcName) {
return mArcTable.getSubEntryData(oarcName, "g3d/model.brres");
}
void *OarcManager::getZevFromArc(const char *oarcName) {
return mArcTable.getDataFromOarc(oarcName, "dat/zev.dat");
}
void *OarcManager::getDzbFromArc(const char *oarcName, const char *fileName) {
SizedString<32> str = "dzb/";
str += fileName;
str += ".dzb";
return mArcTable.getDataFromOarc(oarcName, &str);
}
void *OarcManager::getPlcFromArc(const char *oarcName, const char *fileName) {
SizedString<32> str = "dat/";
str += fileName;
str += ".plc";
return mArcTable.getDataFromOarc(oarcName, &str);
}
void *OarcManager::getSubEntryData(const char *oarcName, const char *fileName) {
return mArcTable.getSubEntryData(oarcName, fileName);
}
bool OarcManager::create(EGG::Heap *heap) {
new (heap, 0x04) OarcManager();
if (OarcManager::sInstance == nullptr) {
return false;
}
OarcManager::sInstance->init(heap);
return true;
}