fix some casting

3 files changed, 17 insertions, 28 deletions

diff --git a/src/d/a/d_a_base.cpp b/src/d/a/d_a_base.cpp
index a8db873a..afe82995 100644
--- a/src/d/a/d_a_base.cpp
+++ b/src/d/a/d_a_base.cpp
@@ -32,9 +32,9 @@ u32 dAcBase_c::s_Create_Params2 = -1;
 u16 dAcBase_c::s_Create_UnkFlags = -1;
 u8 dAcBase_c::s_Create_ViewClipIdx = -1;
 
-mVec3_c *dAcBase_c::s_Create_Position;
-mAng3_c *dAcBase_c::s_Create_Rotation;
-mVec3_c *dAcBase_c::s_Create_Scale;
+const mVec3_c *dAcBase_c::s_Create_Position;
+const mAng3_c *dAcBase_c::s_Create_Rotation;
+const mVec3_c *dAcBase_c::s_Create_Scale;
 dAcBase_c *dAcBase_c::s_Create_Parent;
 const ActorInfo *dAcBase_c::s_Create_ActorInfo;
 u8 dAcBase_c::s_Create_Subtype;
@@ -86,8 +86,8 @@ dAcBase_c::dAcBase_c()
 dAcBase_c::~dAcBase_c() {}
 
 void dAcBase_c::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
 ) {
     s_Create_Position = pos;
     s_Create_Rotation = rot;
diff --git a/src/d/a/obj/d_a_obj_base.cpp b/src/d/a/obj/d_a_obj_base.cpp
index c479dc78..d72983be 100644
--- a/src/d/a/obj/d_a_obj_base.cpp
+++ b/src/d/a/obj/d_a_obj_base.cpp
@@ -188,9 +188,8 @@ int dAcObjBase_c::preDraw() {
     }
 
     if ((notOk || checkObjectProperty(OBJ_PROP_0x200)) ||
-        (mLinkage.checkState(dLinkage_c::STATE_ACTIVE) &&
-         ((dAcObjBase_c *)mLinkage.getControllingActor())->isPlayer() && mLinkage.getControllingActor() &&
-         ((dAcObjBase_c *)mLinkage.getControllingActor())->checkObjectProperty(OBJ_PROP_0x200))) {
+        (mLinkage.checkState(dLinkage_c::STATE_ACTIVE) && mLinkage.getControllingActor()->isPlayer() &&
+         (mLinkage.getControllingActor() && mLinkage.getControllingActor()->checkObjectProperty(OBJ_PROP_0x200)))) {
         return NOT_READY;
     }
 
@@ -215,9 +214,7 @@ dAcObjBase_c *dAcObjBase_c::create(
     ProfileName profile, u32 roomID, u32 params, const mVec3_c *pPos, const mAng3_c *pRot, const mVec3_c *pScale,
     u32 params2
 ) {
-    setTempCreateParams(
-        (mVec3_c *)pPos, (mAng3_c *)pRot, (mVec3_c *)pScale, roomID, params2, nullptr, 0, 0xFFFF, 0xFF, nullptr
-    );
+    setTempCreateParams(pPos, pRot, pScale, roomID, params2, nullptr, 0, 0xFFFF, 0xFF, nullptr);
     return static_cast<dAcObjBase_c *>(createBase(profile, dStage_c::getParentForRoom(roomID), params, ACTOR));
 }
 
@@ -226,10 +223,7 @@ dAcObjBase_c *dAcObjBase_c::create(
     u32 params2, u16 id, s8 viewclipId
 ) {
     const ActorInfo *pInfo = getActorInfoByName(name);
-    setTempCreateParams(
-        (mVec3_c *)pPos, (mAng3_c *)pRot, (mVec3_c *)pScale, roomID, params2, nullptr, pInfo->subtype, id, viewclipId,
-        pInfo
-    );
+    setTempCreateParams(pPos, pRot, pScale, roomID, params2, nullptr, pInfo->subtype, id, viewclipId, pInfo);
     return static_cast<dAcObjBase_c *>(createBase(pInfo->profileId, dStage_c::getParentForRoom(roomID), params, ACTOR));
 }
 
@@ -423,30 +417,25 @@ bool dAcObjBase_c::fn_8002eff0(
 }
 
 // These may not belong here
-dAcBase_c *dAcObjBase_c::createInsectActor(
+dAcObjBase_c *dAcObjBase_c::createInsectActor(
     dAcBase_c *parent, ProfileName actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2,
     s32 roomId
 ) {
-    return parent->createActor(actorId, params1, pos, rot, scale, params2, roomId, parent);
+    return static_cast<dAcObjBase_c *>(parent->createActor(actorId, params1, pos, rot, scale, params2, roomId, parent));
 }
 
-dAcBase_c *dAcObjBase_c::createStageActor(
+dAcObjBase_c *dAcObjBase_c::createStageActor(
     ProfileName profile, u32 roomID, u32 params, mVec3_c *pPos, mAng3_c *pRot, mVec3_c *pScale, u32 params2
 ) {
-    setTempCreateParams(
-        (mVec3_c *)pPos, (mAng3_c *)pRot, (mVec3_c *)pScale, roomID, params2, nullptr, 0, 0xFFFF, 0xFF, nullptr
-    );
+    setTempCreateParams(pPos, pRot, pScale, roomID, params2, nullptr, 0, 0xFFFF, 0xFF, nullptr);
     return static_cast<dAcObjBase_c *>(createBase(profile, dStage_c::getParentForRoom(roomID), params, STAGE));
 }
 
-dAcBase_c *dAcObjBase_c::createStageActor(
+dAcObjBase_c *dAcObjBase_c::createStageActor(
     const char *name, u32 roomID, u32 params, const mVec3_c *pPos, const mAng3_c *pRot, const mVec3_c *pScale,
     u32 params2, u16 id, s8 viewclipId
 ) {
     const ActorInfo *pInfo = getActorInfoByName(name);
-    setTempCreateParams(
-        (mVec3_c *)pPos, (mAng3_c *)pRot, (mVec3_c *)pScale, roomID, params2, nullptr, pInfo->subtype, id, viewclipId,
-        pInfo
-    );
+    setTempCreateParams(pPos, pRot, pScale, roomID, params2, nullptr, pInfo->subtype, id, viewclipId, pInfo);
     return static_cast<dAcObjBase_c *>(createBase(pInfo->profileId, dStage_c::getParentForRoom(roomID), params, STAGE));
 }
diff --git a/src/d/a/obj/d_a_obj_bomb.cpp b/src/d/a/obj/d_a_obj_bomb.cpp
index 047cbf84..4b00a842 100644
--- a/src/d/a/obj/d_a_obj_bomb.cpp
+++ b/src/d/a/obj/d_a_obj_bomb.cpp
@@ -994,8 +994,8 @@ void dAcBomb_c::setBombColor() {
             if ( 
             // Is controlled - and by player
             // And Controlling Actor (player) as objprop 0x200 set
-               (mLinkage.checkState(dLinkage_c::STATE_ACTIVE) && static_cast<dAcObjBase_c *>(mLinkage.getControllingActor())->isPlayer()) 
-               && ((pObj = static_cast<dAcObjBase_c *>(mLinkage.getControllingActor())) && pObj->checkObjectProperty(OBJ_PROP_0x200)) 
+               (mLinkage.checkState(dLinkage_c::STATE_ACTIVE) &&mLinkage.getControllingActor()->isPlayer()) 
+               && ((pObj = mLinkage.getControllingActor()) && pObj->checkObjectProperty(OBJ_PROP_0x200)) 
             // OOOOR this bomb has it set.
                || checkObjectProperty(OBJ_PROP_0x200)
             ) {