summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-01-30 11:40:11 +0100
committerLéo Lam <leo@leolam.fr>2022-01-30 11:40:11 +0100
commit891b95efffffab8f9472cc07888b8faae50ae1a5 (patch)
tree7ca36ecf2d0efc9a68d2cfcbb0dee4be1b17abe8 /src
parent682897091ab0ea2af86ba3a2327379766d07b2e3 (diff)
ksys/phys: Fix a bool flag being defined as u32 in RigidBodyFactory
Diffstat (limited to 'src')
-rw-r--r--src/KingSystem/Physics/RigidBody/Shape/physBoxShape.h2
-rw-r--r--src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.h2
-rw-r--r--src/KingSystem/Physics/RigidBody/Shape/physCylinderShape.h2
-rw-r--r--src/KingSystem/Physics/RigidBody/Shape/physSphereShape.h2
-rw-r--r--src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.h2
-rw-r--r--src/KingSystem/Physics/RigidBody/physRigidBodyFactory.cpp10
6 files changed, 10 insertions, 10 deletions
diff --git a/src/KingSystem/Physics/RigidBody/Shape/physBoxShape.h b/src/KingSystem/Physics/RigidBody/Shape/physBoxShape.h
index e1bc35dd..8fa686e0 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/physBoxShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/physBoxShape.h
@@ -10,7 +10,7 @@ class BoxParam;
struct BoxShape {
virtual ~BoxShape();
- RigidBody* createBody(u32 flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
+ RigidBody* createBody(bool flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
};
struct BoxShapeParam {
diff --git a/src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.h b/src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.h
index 3d36246b..936b8793 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.h
@@ -43,7 +43,7 @@ struct CapsuleShape {
virtual void updateChanges();
virtual void scaleVerts(f32 scale);
- RigidBody* createBody(u32 flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
+ RigidBody* createBody(bool flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
CapsuleShape* clone(sead::Heap* heap);
f32 getRadius() const;
void getVertices(sead::Vector3f* va, sead::Vector3f* vb) const;
diff --git a/src/KingSystem/Physics/RigidBody/Shape/physCylinderShape.h b/src/KingSystem/Physics/RigidBody/Shape/physCylinderShape.h
index ca242e0e..d68ebdb9 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/physCylinderShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/physCylinderShape.h
@@ -10,7 +10,7 @@ class CylinderParam;
struct CylinderShape {
virtual ~CylinderShape();
- RigidBody* createBody(u32 flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
+ RigidBody* createBody(bool flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
};
struct CylinderShapeParam {
diff --git a/src/KingSystem/Physics/RigidBody/Shape/physSphereShape.h b/src/KingSystem/Physics/RigidBody/Shape/physSphereShape.h
index 70c1667c..0fd05a09 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/physSphereShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/physSphereShape.h
@@ -10,7 +10,7 @@ class SphereParam;
struct SphereShape {
virtual ~SphereShape();
- RigidBody* createBody(u32 flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
+ RigidBody* createBody(bool flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
};
struct SphereShapeParam {
diff --git a/src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.h b/src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.h
index 4354df60..f9051548 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.h
@@ -10,7 +10,7 @@ class WaterCylinderParam;
struct WaterCylinderShape {
virtual ~WaterCylinderShape();
- RigidBody* createBody(u32 flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
+ RigidBody* createBody(bool flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
};
struct WaterCylinderShapeParam {
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.cpp
index 16d6e565..54b574a4 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.cpp
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.cpp
@@ -14,7 +14,7 @@ RigidBody* RigidBodyFactory::createSphere(RigidBodyInstanceParam* params, sead::
auto* v = sead::DynamicCast<SphereParam>(params);
auto* shape = v->shape.createShape(heap);
- return shape->createBody(1, *params, heap);
+ return shape->createBody(true, *params, heap);
}
RigidBody* RigidBodyFactory::createCapsule(RigidBodyInstanceParam* params, sead::Heap* heap) {
@@ -23,7 +23,7 @@ RigidBody* RigidBodyFactory::createCapsule(RigidBodyInstanceParam* params, sead:
auto* v = sead::DynamicCast<CapsuleParam>(params);
auto* shape = v->shape.createShape(heap);
- return shape->createBody(1, *params, heap);
+ return shape->createBody(true, *params, heap);
}
RigidBody* RigidBodyFactory::createCylinder(RigidBodyInstanceParam* params, sead::Heap* heap) {
@@ -32,7 +32,7 @@ RigidBody* RigidBodyFactory::createCylinder(RigidBodyInstanceParam* params, sead
auto* v = sead::DynamicCast<CylinderParam>(params);
auto* shape = v->shape.createShape(heap);
- return shape->createBody(1, *params, heap);
+ return shape->createBody(true, *params, heap);
}
RigidBody* RigidBodyFactory::createWaterCylinder(RigidBodyInstanceParam* params, sead::Heap* heap) {
@@ -41,7 +41,7 @@ RigidBody* RigidBodyFactory::createWaterCylinder(RigidBodyInstanceParam* params,
auto* v = sead::DynamicCast<WaterCylinderParam>(params);
auto* shape = v->shape.createShape(heap);
- return shape->createBody(1, *params, heap);
+ return shape->createBody(true, *params, heap);
}
RigidBody* RigidBodyFactory::createBox(RigidBodyInstanceParam* params, sead::Heap* heap) {
@@ -50,7 +50,7 @@ RigidBody* RigidBodyFactory::createBox(RigidBodyInstanceParam* params, sead::Hea
auto* v = sead::DynamicCast<BoxParam>(params);
auto* shape = v->shape.createShape(heap);
- return shape->createBody(1, *params, heap);
+ return shape->createBody(true, *params, heap);
}
} // namespace ksys::phys