Allow creating a TObjOwnerDerivedFromObj from a nullptr, match and link CProjectileWeaponDataFactory

Author: Antidote

configure.py

@@ -1535,7 +1535,7 @@ def EquivalentFor(*versions):
                     else []
                 ),
             ),
-            Object(EquivalentFor("GM8E01_00"), "Weapons/CProjectileWeaponDataFactory.cpp"),
+            Object(MatchingFor("GM8E01_00"), "Weapons/CProjectileWeaponDataFactory.cpp"),
             Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Weapons/CCollisionResponseData.cpp"),
             Object(
                 MatchingFor("GM8E01_00", "GM8E01_01"), "Weapons/IWeaponRenderer.cpp"

include/Kyoto/IObj.hpp

@@ -35,6 +35,7 @@ inline CObjOwnerDerivedFromIObjUntyped::~CObjOwnerDerivedFromIObjUntyped() {}
 template < typename T >
 class TObjOwnerDerivedFromIObj : public CObjOwnerDerivedFromIObjUntyped {
 public:
+  TObjOwnerDerivedFromIObj(T* obj) : CObjOwnerDerivedFromIObjUntyped(obj) {}
   ~TObjOwnerDerivedFromIObj() {
     if (Owned()) {
       delete Owned();
@@ -66,9 +67,8 @@ class TObjOwnerDerivedFromIObj : public CObjOwnerDerivedFromIObjUntyped {
     return rs_new TObjOwnerDerivedFromIObj< T >(obj);
 #endif
   }
-
+  
 private:
-  TObjOwnerDerivedFromIObj(T* obj) : CObjOwnerDerivedFromIObjUntyped(obj) {}
   TObjOwnerDerivedFromIObj(const rstl::auto_ptr< T >& obj) : CObjOwnerDerivedFromIObjUntyped(obj) {}
 };
 

include/Kyoto/Math/CUnitVector3f.hpp

@@ -19,6 +19,7 @@ class CUnitVector3f : public CVector3f {
       Normalize();
     }
   }
+
   CUnitVector3f(const CVector3f& vec, const ENormalize normalize) : CVector3f(vec) {
     if (normalize == kN_Yes) {
       Normalize();

src/Weapons/CProjectileWeaponDataFactory.cpp

@@ -2,6 +2,7 @@
 
 #include "Kyoto/CRandom16.hpp"
 #include "Kyoto/CVParamTransfer.hpp"
+#include "MetroidPrime/Weapons/CWeapon.hpp"
 #include "Weapons/CWeaponDescription.hpp"
 
 #include <Kyoto/Particles/CParticleDataFactory.hpp>
@@ -14,6 +15,9 @@ const CFactoryFnReturn FProjectileWeaponDataFactory(const SObjectTag& tag, CInpu
   return CProjectileWeaponDataFactory::GetGeneratorDesc(in, pool);
 }
 
+void hack() {
+  TObjOwnerDerivedFromIObj< CWeaponDescription >(nullptr);
+}
 CWeaponDescription* CProjectileWeaponDataFactory::GetGeneratorDesc(CInputStream& in,
                                                                    CSimplePool* pool) {
   rstl::vector< CAssetId > assets;
@@ -134,8 +138,7 @@ bool CProjectileWeaponDataFactory::CreateWPSM(CWeaponDescription* desc, CInputSt
     case 'COLR': {
       if (CParticleDataFactory::GetClassID(in) != 'NONE') {
         CAssetId id = in.ReadLong();
-        desc->mCOLR =
-            TLockedToken< CCollisionResponseData >(pool->GetObj(SObjectTag('CRSC', id)));
+        desc->mCOLR = TLockedToken< CCollisionResponseData >(pool->GetObj(SObjectTag('CRSC', id)));
       }
       break;
     }