summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorelijah-thomas774 <elijahthomas774@gmail.com>2026-10-19 13:12:56 -0400
committerelijah-thomas774 <elijahthomas774@gmail.com>2026-10-19 13:12:56 -0400
commit5633a09e0223ddcea4fd0bb2cc79a126d3816182 (patch)
tree21ab2fd8c7c7516bc01058394c28ac85df92b6d0 /include
parent13ba66675331e187f7512ced1409587f96a59029 (diff)
fix some casting
Diffstat (limited to 'include')
-rw-r--r--include/d/a/d_a_base.h10
-rw-r--r--include/d/a/obj/d_a_obj_base.h7
-rw-r--r--include/d/d_linkage.h4
3 files changed, 10 insertions, 11 deletions
diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h
index 93c0fc86..1b9478a2 100644
--- a/include/d/a/d_a_base.h
+++ b/include/d/a/d_a_base.h
@@ -224,8 +224,8 @@ public:
public:
static void setTempCreateParams(
- mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, s32 roomId, u32 params2, dAcBase_c *parent, u8 subtype, u16 unkFlag,
- s8 viewClipIdx, const ActorInfo *actorInfo
+ const mVec3_c *pos, const mAng3_c *rot, const mVec3_c *scale, s32 roomId, u32 params2, dAcBase_c *parent,
+ u8 subtype, u16 unkFlag, s8 viewClipIdx, const ActorInfo *actorInfo
);
dSoundSourceIf_c *createSoundSource();
@@ -313,9 +313,9 @@ public:
static u32 s_Create_Params2;
static u16 s_Create_UnkFlags;
static u8 s_Create_ViewClipIdx;
- static mVec3_c *s_Create_Position;
- static mAng3_c *s_Create_Rotation;
- static mVec3_c *s_Create_Scale;
+ static const mVec3_c *s_Create_Position;
+ static const mAng3_c *s_Create_Rotation;
+ static const mVec3_c *s_Create_Scale;
static dAcBase_c *s_Create_Parent;
static const ActorInfo *s_Create_ActorInfo;
static u8 s_Create_Subtype;
diff --git a/include/d/a/obj/d_a_obj_base.h b/include/d/a/obj/d_a_obj_base.h
index 57befe36..a05a9fd3 100644
--- a/include/d/a/obj/d_a_obj_base.h
+++ b/include/d/a/obj/d_a_obj_base.h
@@ -228,15 +228,14 @@ public:
ProfileName actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2, u32 roomId
);
- // These may not belong here
- static dAcBase_c *createInsectActor(
+ static dAcObjBase_c *createInsectActor(
dAcBase_c *parent, ProfileName actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2,
s32 roomId
);
- static dAcBase_c *createStageActor(
+ static dAcObjBase_c *createStageActor(
ProfileName actorId, u32 roomId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2
);
- static dAcBase_c *createStageActor(
+ static dAcObjBase_c *createStageActor(
const char *name, u32 roomId, u32 params1, const mVec3_c *pos, const mAng3_c *rot, const mVec3_c *scale,
u32 params2, u16 id, s8 viewclipId
);
diff --git a/include/d/d_linkage.h b/include/d/d_linkage.h
index 64770009..5ee53ff5 100644
--- a/include/d/d_linkage.h
+++ b/include/d/d_linkage.h
@@ -91,8 +91,8 @@ public:
return field_0xA0->getArrowOffsetPosAndAngle(param_1, param_2, param_3, param_4, param_5);
}
- dAcBase_c *getControllingActor() {
- return static_cast<dAcBase_c *>(mControllingActor.p_owner);
+ dAcObjBase_c *getControllingActor() {
+ return (dAcObjBase_c *)(mControllingActor.p_owner);
}
void setField_0x8C_0x90(f32 f0, f32 f1) {