mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-30 16:03:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Small type improvements

Browse Source
This commit is contained in:
robojumper
2024-05-25 14:26:56 +02:00
parent 419097a192
commit ed2f569a89
5 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_base.cpp
+6 -14
View File
@@ -501,10 +501,7 @@ dAcBase_c *dAcBase_c::createActor(ProfileName actorId, u32 actorParams1, mVec3_c
actorRoomid = roomid;
}
u32 newParams2 = -1;
if (actorParams2 != 0) {
newParams2 = getParams2_ignoreLower();
}
u32 newParams2 = actorParams2 != 0 ? getParams2_ignoreLower() : -1;
setTempCreateParams(actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1,
0xFF, nullptr);
@@ -532,10 +529,7 @@ dAcBase_c *dAcBase_c::createActorStage(ProfileName actorId, u32 actorParams1, mV
actorRoomid = roomid;
}
u32 newParams2 = -1;
if (actorParams2 != 0) {
newParams2 = getParams2_ignoreLower();
}
u32 newParams2 = actorParams2 != 0 ? getParams2_ignoreLower() : -1;
setTempCreateParams(actorPosition, actorRotation, actorScale, actorRoomid, newParams2, (dAcBase_c *)actorRef, 0, -1,
0xFF, nullptr);
@@ -561,19 +555,17 @@ void dAcBase_c::doInteraction(s32 param) {
// 8002dc20
void dAcBase_c::FUN_8002dc20(s16 *, s16 *) {}
// This whole function gets compiled to just a `blr`
// Not sure how to make this work as expected
// 8002dc50
void dAcBase_c::incrementKillCounter() {
dAcObjBase_c *object = (dAcObjBase_c *)this; // Probably wrong
FileManager *fileMgr = FileManager::sInstance;
if (group_type == ACTOR && object->unkByteTargetFiRelated == 1) {
s16 killCounterId = object->targetFiTextId;
int killCounterId = object->targetFiTextId;
if (killCounterId < 91 && killCounterId & 0x300 == 0) {
s16 killCount = fileMgr->getEnemyKillCount(killCounterId & 0xFF);
if (killCounterId < 91 && (killCounterId & 0x300) == 0) {
FileManager *fileMgr = FileManager::sInstance;
u16 killCount = fileMgr->getEnemyKillCount(killCounterId) + 1;
fileMgr->setEnemyKillCount(killCounterId, killCount);
}
}
src/toBeSorted/file_manager.cpp
+4 -4
View File
@@ -210,10 +210,10 @@ inline void strnsth(char *dest, const char *src, size_t max_len) {
/* 8000BA70 */ void FileManager::setBeaconPos(u32 beaconArea, u32 beaconNum, mVec3_c *pos) {}
/* 8000BB80 */ mVec3_c *FileManager::getBeaconPos(u32 beaconArea, u32 beaconNum) {}
/* 8000BC70 */ void FileManager::setEnemyKillCount(u32 enemy, u16 killCount) {}
/* 8000BCE0 */ s16 FileManager::getEnemyKillCount(u32 enemy) {}
/* 8000BD60 */ void FileManager::setHitCountFromEnemy(u32 enemy, u16 hitCount) {}
/* 8000BDD0 */ u16 FileManager::getHitCountFromEnemy(u32 enemy) {}
/* 8000BC70 */ void FileManager::setEnemyKillCount(u8 enemy, u16 killCount) {}
/* 8000BCE0 */ u16 FileManager::getEnemyKillCount(u8 enemy) {}
/* 8000BD60 */ void FileManager::setHitCountFromEnemy(u8 enemy, u16 hitCount) {}
/* 8000BDD0 */ u16 FileManager::getHitCountFromEnemy(u8 enemy) {}
/* 8000BE50 */ void FileManager::setLoadRoomT1_FileB(s16 roomId) {}
/* 8000BE80 */ s16 FileManager::getLoadRoomT1_FileB() {}