make legacy particle spews more robust (scp-fs2open#7023)

Goober5000 · web-flow · commit fc102056b853 · 2025-09-07T02:32:07.000Z
If a pspew specifies a single-frame image, be sure that it is loaded correctly.  Fixes a particle crash in Inferno.
diff --git a/code/weapon/weapons.cpp b/code/weapon/weapons.cpp
@@ -776,7 +776,7 @@ static particle::ParticleEffectHandle convertLegacyPspewBuffer(const pspew_legac
 			IS_VEC_NULL(&pspew_buffer.particle_spew_offset) ? std::nullopt : std::optional(pspew_buffer.particle_spew_offset), //Local offset
 			::util::UniformFloatRange(pspew_buffer.particle_spew_lifetime), //Lifetime
 			::util::UniformFloatRange(pspew_buffer.particle_spew_radius), //Radius
-			hasAnim ? bm_load_animation(pspew_buffer.particle_spew_anim.c_str()) : particle::Anim_bitmap_id_smoke)); //Bitmap
+			hasAnim ? bm_load_either(pspew_buffer.particle_spew_anim.c_str()) : particle::Anim_bitmap_id_smoke)); //Bitmap or Anim
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ static particle::ParticleEffectHandle convertLegacyPspewBuffer(const pspew_legac`
`776`	`776`	`IS_VEC_NULL(&pspew_buffer.particle_spew_offset) ? std::nullopt : std::optional(pspew_buffer.particle_spew_offset), //Local offset`
`777`	`777`	`::util::UniformFloatRange(pspew_buffer.particle_spew_lifetime), //Lifetime`
`778`	`778`	`::util::UniformFloatRange(pspew_buffer.particle_spew_radius), //Radius`
`779`		`- hasAnim ? bm_load_animation(pspew_buffer.particle_spew_anim.c_str()) : particle::Anim_bitmap_id_smoke)); //Bitmap`
	`779`	`+ hasAnim ? bm_load_either(pspew_buffer.particle_spew_anim.c_str()) : particle::Anim_bitmap_id_smoke)); //Bitmap or Anim`
`780`	`780`	`}`
`781`	`781`
`782`	`782`	`/**`