Merge branch 'master' into omegapirate

# Conflicts:
#	Runtime/GuiSys/CAuiImagePane.cpp

Runtime/World/CActorModelParticles.cpp

@@ -18,9 +18,10 @@
 
 namespace urde {
 
-static bool IsMediumOrLarge(CActor& act) {
-  if (TCastToConstPtr<CPatterned> pat = act)
+static bool IsMediumOrLarge(const CActor& act) {
+  if (const TCastToConstPtr<CPatterned> pat = act) {
     return pat->GetKnockBackController().GetVariant() != EKnockBackVariant::Small;
+  }
   return false;
 }
 

Runtime/World/CPlayer.cpp

@@ -3323,7 +3323,7 @@ void CPlayer::UpdateAimTargetPrediction(const zeus::CTransform& xf, const CState
     return;
   }
 
-  x9c6_27_aimingAtProjectile = TCastToConstPtr<CGameProjectile>(target.GetPtr());
+  x9c6_27_aimingAtProjectile = TCastToConstPtr<CGameProjectile>(target.GetPtr()).IsValid();
   const zeus::CVector3f instantTarget = target->GetAimPosition(mgr, 0.f);
   const zeus::CVector3f gunToTarget = instantTarget - xf.origin;
   const float timeToTarget = gunToTarget.magnitude() / x490_gun->GetBeamVelocity();
@@ -5076,7 +5076,7 @@ bool CPlayer::ValidateOrbitTargetIdAndPointer(TUniqueId uid, CStateManager& mgr)
   if (uid == kInvalidUniqueId) {
     return false;
   }
-  return TCastToConstPtr<CActor>(mgr.GetObjectById(uid));
+  return TCastToConstPtr<CActor>(mgr.GetObjectById(uid)).IsValid();
 }
 
 zeus::CVector3f CPlayer::GetBallPosition() const {

Runtime/World/CScriptPlatform.hpp

@@ -8,6 +8,7 @@
 #include "Runtime/CToken.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/rstl.hpp"
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
 #include "Runtime/World/CDamageVulnerability.hpp"
 #include "Runtime/World/CHealthInfo.hpp"
 #include "Runtime/World/CPhysicsActor.hpp"
@@ -17,8 +18,6 @@
 #include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CCollidableOBBTreeGroup;
-class CCollidableOBBTreeGroupContainer;
 class CFluidPlane;
 
 struct SRiders {

Runtime/World/CStateMachine.cpp

@@ -4,6 +4,8 @@
 #include "Runtime/World/CAi.hpp"
 
 namespace urde {
+static logvisor::Module Log("urde::CStateMachine");
+
 CStateMachine::CStateMachine(CInputStream& in) {
   CAiTrigger* lastTrig = nullptr;
   u32 stateCount = in.readUint32Big();
@@ -78,10 +80,8 @@ void CStateMachineState::Update(CStateManager& mgr, CAi& ai, float delta) {
       if (andPassed && state) {
         x4_state->CallFunc(mgr, ai, EStateMsg::Deactivate, 0.f);
         x4_state = state;
-//#ifndef NDEBUG
-//        fmt::print(FMT_STRING("{} {} {} - {} {}\n"), ai.GetUniqueId(), ai.GetEditorId(), ai.GetName(),
-//                   state->xc_name, int(state - x0_machine->GetStateVector().data()));
-//#endif
+        Log.report(logvisor::Info, FMT_STRING("{} {} {} - {} {}"), ai.GetUniqueId(), ai.GetEditorId(), ai.GetName(),
+                   state->xc_name, int(state - x0_machine->GetStateVector().data()));
         x8_time = 0.f;
         x18_24_codeTrigger = false;
         xc_random = mgr.GetActiveRandom()->Float();

Runtime/World/CWorldTransManager.hpp

@@ -14,6 +14,7 @@
 #include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
 #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
 #include "Runtime/GuiSys/CGuiTextSupport.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
 
 #include <zeus/CTransform.hpp>
 #include <zeus/CVector2f.hpp>
@@ -21,7 +22,6 @@
 
 namespace urde {
 class CSimplePool;
-class CStringTable;
 
 class CWorldTransManager {
 public: