fix: projectile related crashes

tiltedphoques · Dec 20, 2021 · 48eec06 · 48eec06
1 parent be717b6
commit 48eec06
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -1073,9 +1073,7 @@ void CharacterService::OnNotifyProjectileLaunch(const NotifyProjectileLaunch& ac
     ProjectileLaunchData launchData{};
 #endif
 
-#if TP_FALLOUT4
     launchData.pShooter = RTTI_CAST(TESForm::GetById(formIdComponent.Id), TESForm, TESObjectREFR);
-#endif
 
     launchData.Origin.x = acMessage.OriginX;
     launchData.Origin.y = acMessage.OriginY;
@@ -1084,6 +1082,11 @@ void CharacterService::OnNotifyProjectileLaunch(const NotifyProjectileLaunch& ac
     const uint32_t cProjectileBaseId = modSystem.GetGameId(acMessage.ProjectileBaseID);
     launchData.pProjectileBase = TESForm::GetById(cProjectileBaseId);
 
+#if TP_SKYRIM64
+    const uint32_t cFromWeaponId = modSystem.GetGameId(acMessage.WeaponID);
+    launchData.pFromWeapon = RTTI_CAST(TESForm::GetById(cFromWeaponId), TESForm, TESObjectWEAP);
+#endif
+
 #if TP_FALLOUT4
     Actor* pShooter = RTTI_CAST(launchData.pShooter, TESObjectREFR, Actor);
     pShooter->GetCurrentWeapon(&launchData.FromWeapon, 0);