Write actual value of sfx volume into cache (#110)

Schroedingers-Cat · web-flow · commit e8394e991727 · 2025-08-14T20:27:07.000+02:00
diff --git a/Sources/Jazz2/Compatibility/JJ2Data.cpp b/Sources/Jazz2/Compatibility/JJ2Data.cpp
@@ -167,7 +167,7 @@ namespace Jazz2::Compatibility
 				so.WriteValue<std::uint16_t>(0);
 			}
 
-			so.WriteValue<std::uint8_t>((std::uint8_t)std::max(sfx.Volume * 255 / 0x40, (std::uint32_t)UINT8_MAX));
+			so.WriteValue<std::uint8_t>((std::uint8_t)std::min(sfx.Volume * 255 / 0x40, (std::uint32_t)UINT8_MAX));
 			so.WriteValue<std::int8_t>((std::int8_t)std::clamp(((std::int32_t)sfx.Panning - 0x20) * INT8_MAX / /*0x20*/0x40, -(std::int32_t)INT8_MAX, (std::int32_t)INT8_MAX));
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ namespace Jazz2::Compatibility`
`167`	`167`	`so.WriteValue<std::uint16_t>(0);`
`168`	`168`	`}`
`169`	`169`
`170`		`- so.WriteValue<std::uint8_t>((std::uint8_t)std::max(sfx.Volume * 255 / 0x40, (std::uint32_t)UINT8_MAX));`
	`170`	`+ so.WriteValue<std::uint8_t>((std::uint8_t)std::min(sfx.Volume * 255 / 0x40, (std::uint32_t)UINT8_MAX));`
`171`	`171`	`so.WriteValue<std::int8_t>((std::int8_t)std::clamp(((std::int32_t)sfx.Panning - 0x20) * INT8_MAX / /0x20/0x40, -(std::int32_t)INT8_MAX, (std::int32_t)INT8_MAX));`
`172`	`172`	`}`
`173`	`173`