mirror of
https://github.com/zeldaret/botw
synced 2026-07-30 07:45:30 -04:00
ksys/phys: Move orGroundHitTypeMask to the correct TU
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
|
||||
#include "KingSystem/Physics/System/physEntityGroupFilter.h"
|
||||
#include "KingSystem/Physics/System/physShapeParam.h"
|
||||
|
||||
namespace ksys::phys {
|
||||
@@ -77,12 +78,6 @@ MotionType RigidBodyParam::getMotionType() const {
|
||||
return motionTypeFromText(*info.motion_type);
|
||||
}
|
||||
|
||||
// TODO: move this to another translation unit (figure out where this belongs)
|
||||
[[gnu::noinline]] static u32 orGroundHitTypeMask(u32 mask, const sead::SafeString& type) {
|
||||
mask |= (0x100 << groundHitFromText(type)) & 0xffff00;
|
||||
return mask;
|
||||
}
|
||||
|
||||
namespace {
|
||||
constexpr const char* navmesh_types[] = {
|
||||
"NOT_USE",
|
||||
|
||||
@@ -40,4 +40,13 @@ int EntityGroupFilter::getFreeListIndex(const SystemGroupHandler* handler) {
|
||||
return handler->getIndex() < NumEntityHandlersInList0;
|
||||
}
|
||||
|
||||
u32 orGroundHitTypeMask(u32 mask, GroundHit type) {
|
||||
mask |= (0x100 << type) & 0xffff00;
|
||||
return mask;
|
||||
}
|
||||
|
||||
u32 orGroundHitTypeMask(u32 mask, const sead::SafeString& type) {
|
||||
return orGroundHitTypeMask(mask, groundHitFromText(type));
|
||||
}
|
||||
|
||||
} // namespace ksys::phys
|
||||
|
||||
@@ -60,4 +60,7 @@ private:
|
||||
sead::SafeArray<u32, ContactLayer::size()> mMasks;
|
||||
};
|
||||
|
||||
u32 orGroundHitTypeMask(u32 mask, GroundHit type);
|
||||
u32 orGroundHitTypeMask(u32 mask, const sead::SafeString& type);
|
||||
|
||||
} // namespace ksys::phys
|
||||
|
||||
Reference in New Issue
Block a user