Fixed segfault when haptics.json can't be found and a plasma pistol is fired

LivingFray · LivingFray · commit ada2d3ba2965 · 2026-01-10T17:25:04.000Z
diff --git a/HaloCEVR/WeaponHapticsConfig.cpp b/HaloCEVR/WeaponHapticsConfig.cpp
@@ -181,7 +181,7 @@ WeaponHaptic WeaponHapticsConfigManager::GetWeaponHaptics(WeaponType Weapon)
 	haptic.TwoHand.Dominant = defaultHaptics;
 	haptic.TwoHand.Nondominant = defaultHaptics;
 
-	for (WeaponHaptic currentHaptic : hapticList)
+	for (WeaponHaptic& currentHaptic : hapticList)
 	{
 		if (currentHaptic.Weapon == Weapon)
 		{
@@ -198,7 +198,7 @@ WeaponHaptic WeaponHapticsConfigManager::GetWeaponHaptics(WeaponType Weapon)
 			plasmaPistolSettings.RampUpTimer = 0;
 		}
 
-		double percentage = plasmaPistolSettings.RampUpTimer / plasmaPistolSettings.RampUpTicks;
+		double percentage = plasmaPistolSettings.RampUpTimer / std::max(1, plasmaPistolSettings.RampUpTicks);
 	
 		double percentageOfChange = std::max(.2, percentage);
 

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ WeaponHaptic WeaponHapticsConfigManager::GetWeaponHaptics(WeaponType Weapon)`
`181`	`181`	`haptic.TwoHand.Dominant = defaultHaptics;`
`182`	`182`	`haptic.TwoHand.Nondominant = defaultHaptics;`
`183`	`183`
`184`		`- for (WeaponHaptic currentHaptic : hapticList)`
	`184`	`+ for (WeaponHaptic& currentHaptic : hapticList)`
`185`	`185`	`{`
`186`	`186`	`if (currentHaptic.Weapon == Weapon)`
`187`	`187`	`{`
`@@ -198,7 +198,7 @@ WeaponHaptic WeaponHapticsConfigManager::GetWeaponHaptics(WeaponType Weapon)`
`198`	`198`	`plasmaPistolSettings.RampUpTimer = 0;`
`199`	`199`	`}`
`200`	`200`
`201`		`- double percentage = plasmaPistolSettings.RampUpTimer / plasmaPistolSettings.RampUpTicks;`
	`201`	`+ double percentage = plasmaPistolSettings.RampUpTimer / std::max(1, plasmaPistolSettings.RampUpTicks);`
`202`	`202`
`203`	`203`	`double percentageOfChange = std::max(.2, percentage);`
`204`	`204`