Weapon Stats Randomizer: Crash fixes

* Fixed a crash because of missing null pointer check in phInst for
  projectile pre-physics simulation function

* Removed problematic weapons from the gun groups in WeaponModels that
  would previously cause a crash. Alternatively, once ScriptHook hooks
  are working, there's an implementation for fixing that in-code with
  a hook (we want to ensure compatibility with Chaos effects that use
  this native).

Author: Parik27

data/WeaponModels.txt

@@ -68,9 +68,6 @@ w_pi_flaregun
 w_ar_heavyrifleh
 w_sb_microsmg_las
 w_sg_pumpshotgun_chs
-prop_space_pistol
-prop_space_rifle
-ch_prop_collectibles_limb_01a
 
 w_ar_advancedrifle
 w_ar_advancedrifle_luxe
@@ -226,9 +223,6 @@ w_lr_firework
 w_lr_homing
 w_lr_rpg
 w_pi_flaregun
-prop_space_pistol
-prop_space_rifle
-ch_prop_collectibles_limb_01a
 
 w_me_bat
 w_me_battleaxe
@@ -6048,4 +6042,4 @@ w_am_jerrycan_sf
 w_ar_heavyrifleh
 w_pi_appistol_sts
 w_sb_microsmg_las
-w_sg_pumpshotgun_chs
+w_sg_pumpshotgun_chs

lib/CEntity.hh

@@ -8,11 +8,12 @@
 class CEntity
 {
 public:
-    void *          vft;
-    void *          m_pRefHolder;
+    void           *vft;
+    void           *m_pRefHolder;
     fwExtensionList m_List;
     CBaseModelInfo *m_pModelInfo;
     uint32_t        m_Type;
+    class phInst   *m_phInst;
 };
 
 static_assert (offsetof (CEntity, m_pModelInfo) == 32);

src/weapons/stats.cc

@@ -1,17 +1,26 @@
+#include "CEntity.hh"
 #include "CItemInfo.hh"
+#include "CModelInfo.hh"
 #include "CStreaming.hh"
 #include "Utils.hh"
 #include "common/events.hh"
 #include "common/config.hh"
+#include "common/minhook.hh"
 #include "common/parser.hh"
 #include "common/logger.hh"
+#include "scrThread.hh"
 #include <cstdint>
+#include <ctime>
 #include <utility>
 
+#include <CTheScripts.hh>
+
 #ifdef ENABLE_DEBUG_MENU
 #include <debug/base.hh>
 #endif
 
+using namespace NativeLiterals;
+
 // Ammo Info Randomizer
 // *******************************************************
 using CAmmoInfoRandomizer = ParserRandomHelper<
@@ -115,9 +124,68 @@ class WeaponStatsRandomizer
         HandleItemInfoRandomization (false);
     }
 
+    /*******************************************************/
+    template <auto &CProjectileEntity__PreSim>
+    static int
+    ProjectilePhysicsFix (CEntity *p1, float p2, bool p3, int p4)
+    {
+        /* Fixes a crash caused by delayed loading of the physics object for a
+         * rocket projectile. This adds a null pointer check that R* forgot ..
+         */
+
+        if (!p1->m_phInst)
+            {
+                Rainbomizer::Logger::LogMessage (
+                    "Projectile Physics Instance not loaded: %x",
+                    p1->m_pModelInfo->m_nHash);
+
+                return 2;
+            }
+
+        return CProjectileEntity__PreSim (p1, p2, p3, p4);
+    }
+
+    /*******************************************************/
+    static void
+    FixShootsAtCoord (scrThread::Info *ctx)
+    {
+        auto ped = ctx->GetArg (0);
+
+        uint32_t weap      = "GET_SELECTED_PED_WEAPON"_n(ped);
+        auto    *weapModel = CStreaming::GetModelByHash (weap);
+
+        static constexpr std::array BlackListedWeapons
+            = {"prop_space_pistol"_joaat, "prop_space_rifle"_joaat,
+               "ch_prop_collectibles_limb_01a"_joaat};
+
+        // We know this can happen with these weapons, so exit without logging
+        if (DoesElementExist (BlackListedWeapons, weap))
+            return;
+
+        // In all other cases (e.g., it gets called for melee weapons randomized
+        // into props), exit with a log message at a cooldown (so as to not spam
+        // the log more than necessary).
+        if (!weapModel
+            || weapModel->GetType () != eModelInfoType::MODEL_INFO_WEAPON)
+            {
+                const int   LOG_COOLDOWN = 5;
+                static auto lastPrint    = 0;
+
+                if (time (NULL) - lastPrint > LOG_COOLDOWN)
+                    Rainbomizer::Logger::LogMessage (
+                        "SET_PED_SHOOTS_AT_COORD called for non-weapon model: "
+                        "%x %p",
+                        weap, weapModel);
+                return;
+            }
+
+        NativeManager::InvokeNative ("SET_PED_SHOOTS_AT_COORD"_joaat, ctx);
+    }
+
     /*******************************************************/
     WeaponStatsRandomizer ()
     {
+
         if (!ConfigManager::ReadConfig ("WeaponStatsRandomizer"))
             return;
 
@@ -128,6 +196,10 @@ class WeaponStatsRandomizer
         DebugInterfaceManager::AddAction ("Randomize Weapon Stats",
                                           RandomizeWeaponStats);
 #endif
+        REGISTER_MH_HOOK (
+            "? 0f 28 e1 ? 8b 41 30 b9 ff ff 00 00 66 39 48 18 75 ?", -0x56,
+            ProjectilePhysicsFix, int, CEntity *, float, bool, int);
+
         InitialiseAllComponents ();
     }
 } _stats;