Merge remote-tracking branch 'origin/main' into 26-02-27-pjb-dev-2

include/f_op/f_op_actor.h

@@ -199,7 +199,7 @@ public:
     BOOL chkCondition(u16 condition) { return (mCondition & condition) == condition; }
 
     void suspendProc(void* actor) {
-        if (field_0x10 != NULL) {
+        if (field_0x10 != 0) {
             field_0x14(actor);
         }
     }

include/f_op/f_op_actor_mng.h

@@ -11,6 +11,7 @@
 #include "f_op/f_op_draw_tag.h"
 #include "f_pc/f_pc_manager.h"
 #include "m_Do/m_Do_hostIO.h"
+#include "SSystem/SComponent/c_phase.h"
 #include "dusk/endian_ssystem.h"
 
 #if !__MWERKS__
@@ -441,7 +442,14 @@ inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
            i_culltype == fopAc_CULLBOX_CUSTOM_e;
 }
 
-inline const cXyz& fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) {
+inline
+#ifdef __MWERKS__
+// In the original code, this constructs a temporary and returns a reference to it
+const cXyz&
+#else
+const Vec&
+#endif
+fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) {
     return i_actor->cull.sphere.center;
 }
 

include/f_op/f_op_scene_mng.h

@@ -4,6 +4,7 @@
 #include "f_op/f_op_scene_pause.h"
 #include "f_pc/f_pc_manager.h"
 #include "f_op/f_op_scene.h"
+#include <cstdint>
 
 typedef struct base_process_class base_process_class;
 
@@ -11,7 +12,7 @@ scene_class* fopScnM_SearchByID(fpc_ProcID id);
 int fopScnM_ChangeReq(scene_class* i_scene, s16 i_procName, s16 param_3, u16 param_4);
 fpc_ProcID fopScnM_DeleteReq(scene_class* i_scene);
 int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, uintptr_t i_data);
-u32 fopScnM_ReRequest(s16 i_procName, u32 i_data);
+u32 fopScnM_ReRequest(s16 i_procName, uintptr_t i_data);
 void fopScnM_Management();
 void fopScnM_Init();
 

include/f_op/f_op_scene_tag.h

@@ -2,7 +2,6 @@
 #define F_F_OP_SCENE_TAG_H_
 
 #include "f_pc/f_pc_node.h"
-#include "SSystem/SComponent/c_phase.h"
 
 class scene_tag_class {
 public: