mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-24 23:21:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditional

Browse Source
This commit is contained in:
robojumper
2024-05-25 20:07:15 +02:00
parent 6da4bb94c5
commit 92e5d46eef
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_rawarchive.cpp
+5 -11
View File
@@ -4,7 +4,6 @@
#include <MSL_C/string.h>
// clang-format on
class UnkManager {
public:
/* vtable at 8050df50 */
@@ -17,7 +16,7 @@ public:
};
extern "C" int fn_80061B10(void *d, u32 len) {
u32 *data = (u32*)d;
u32 *data = (u32 *)d;
u32 result = 0;
// Compiler will unroll this loop
for (u32 len_words = len / 4; len_words != 0; len_words--) {
@@ -35,7 +34,7 @@ extern "C" void fn_80061BE0(UnkManager *mgr, const char *name, size_t len) {
// Sets stage to all spaces
mgr->stage = 0x20202020;
// copies the stage name?
memcpy((char*)&mgr->stage, name, len);
memcpy((char *)&mgr->stage, name, len);
}
dRawArcEntry_c::dRawArcEntry_c() {
@@ -59,7 +58,6 @@ dRawArcEntry_c::~dRawArcEntry_c() {
destroy(nullptr);
}
void dRawArcEntry_c::searchCallback(void *arg, void *data, const ARCDirEntry *entry, const char *path, bool ctrl) {
UnkManager *mgr = (UnkManager *)arg;
if (entry->isDir) {
@@ -86,7 +84,6 @@ void dRawArcEntry_c::searchCallback2(void *a, void *b, const ARCDirEntry *c, con
searchCallback(a, b, c, d, false);
}
bool dRawArcEntry_c::destroy(void *arg) {
if (mpDvdReq != nullptr) {
if (mpDvdReq->mStatus == 0) {
@@ -186,8 +183,7 @@ bool dRawArcEntry_c::checkArcExistsOnDiskInner(char *outBuf, const char *fileNam
int dRawArcEntry_c::mount(const char *name, void *data, void *callbackArg, u8 mountDirection, EGG::Heap *heap) {
inline_strncpy(mArcName, name, sizeof(mArcName));
// TODO this conditional uses a few more instructions in the original binary
mpArc = EGG::Archive::mount(data, heap, mountDirection != 1 ? 4 : -4);
mpArc = EGG::Archive::mount(data, heap, (mountDirection == 0 || mountDirection == 1) ? 4 : -4);
if (mpArc == nullptr) {
return -1;
} else {
@@ -237,7 +233,7 @@ int dRawArcEntry_c::ensureLoadedMaybe(void *callbackArg) {
if (result == -1) {
return result;
}
DCStoreRange(mpFrmHeap, mpFrmHeap->mHeapHandle->end - (u8*)mpFrmHeap);
DCStoreRange(mpFrmHeap, mpFrmHeap->mHeapHandle->end - (u8 *)mpFrmHeap);
}
return 0;
@@ -251,7 +247,6 @@ int dRawArcEntry_c::onMount(void *callbackArg) {
return 0;
}
dRawArcTable_c::dRawArcTable_c() {
mpEntries = nullptr;
mCount = 0;
@@ -391,8 +386,7 @@ int dRawArcTable_c::ensureAllEntriesLoaded() {
return 0;
}
extern "C" bool strequals(const char *, const char*);
extern "C" bool strequals(const char *, const char *);
// TODO the load from self can happen earlier
dRawArcEntry_c *dRawArcTable_c::findEntry(const char *name) const {