Skip to content

Commit 95d21a4

Browse files
authored
Minor Particle Fixes (#6884)
* Fix scripted particle velocity * Add error if no bitmaps were defined
1 parent 8f835fe commit 95d21a4

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

code/particle/ParticleParse.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ namespace particle {
1717
static void parseBitmaps(ParticleEffect &effect) {
1818
if (internal::required_string_if_new("+Filename:", false)) {
1919
effect.m_bitmap_list = internal::parseAnimationList(true);
20-
effect.m_bitmap_range = ::util::UniformRange<size_t>(0, effect.m_bitmap_list.size() - 1);
20+
21+
if (effect.m_bitmap_list.empty()) {
22+
error_display(1, "No bitmap defined for particle effect!");
23+
} else {
24+
effect.m_bitmap_range = ::util::UniformRange<size_t>(0, effect.m_bitmap_list.size() - 1);
25+
}
2126
}
2227
}
2328

code/scripting/api/libs/graphics.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2212,10 +2212,10 @@ particle::ParticleEffectHandle getLegacyScriptingParticleEffect(int bitmap, bool
22122212
::util::UniformFloatRange(), //No duration
22132213
::util::UniformFloatRange (-1.f), //Single particle only
22142214
particle::ParticleEffect::ShapeDirection::ALIGNED, //Particle direction
2215-
::util::UniformFloatRange(), //Velocity Inherit
2215+
::util::UniformFloatRange(1.f), //Velocity Inherit
22162216
false, //Velocity Inherit absolute?
2217-
std::make_unique<particle::ConeVolume>(::util::ParsedRandomFloatRange(), 1.f), //Velocity volume
2218-
::util::UniformFloatRange(1.f), //Velocity volume multiplier
2217+
nullptr, //Velocity volume
2218+
::util::UniformFloatRange(), //Velocity volume multiplier
22192219
particle::ParticleEffect::VelocityScaling::NONE, //Velocity directional scaling
22202220
std::nullopt, //Orientation-based velocity
22212221
std::nullopt, //Position-based velocity

0 commit comments

Comments
 (0)