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

properly use subtype enum

Browse Source
This commit is contained in:
lepelog
2025-12-04 23:26:13 +01:00
parent 30b1ef3659
commit f0889aadb6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/t/d_t_insect.h
+6 -6
View File
@@ -61,16 +61,16 @@ private:
/* 0x260 */ mVec3_c mRevealedSpawnPos;
/* 0x26C */ dAcRef_c<dAcBase_c> mWarpRef;
s32 getSpawnSubtype() const {
return (mParams >> 8 & 0xF);
SpawnSubtype getSpawnSubtype() const {
return (SpawnSubtype)(mParams >> 8 & 0xF);
}
bool isSpawnSubtype(s32 spanwSubtype) const {
bool isSpawnSubtype(SpawnSubtype spanwSubtype) const {
return getSpawnSubtype() == spanwSubtype;
}
s32 getSubtype() const {
return (mParams >> 4 & 0xF);
Subtype getSubtype() const {
return (Subtype)(mParams >> 4 & 0xF);
}
bool isSubtype(u8 subtype) const {
bool isSubtype(Subtype subtype) const {
return getSubtype() == subtype;
}
s32 getInsectCount() const {
src/REL/d/t/d_t_insect.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ inline bool checkProfile(u16 prof, u32 target) {
}
int dTgInsect_c::actorPostCreate() {
s32 subtype = mParams >> 4 & 0xF;
Subtype subtype = getSubtype();
// ??? doesn't match without the double comparison
if (subtype == SUBTYPE_WOODLAND_RHINO_BEETLE
|| subtype == SUBTYPE_WOODLAND_RHINO_BEETLE