Skip to content

make legacy particle spews more robust#7023

Merged
BMagnu merged 1 commit into
scp-fs2open:masterfrom
Goober5000:anim_fix
Sep 7, 2025
Merged

make legacy particle spews more robust#7023
BMagnu merged 1 commit into
scp-fs2open:masterfrom
Goober5000:anim_fix

Conversation

@Goober5000

Copy link
Copy Markdown
Contributor

If a pspew specifies a single-frame image, be sure that it is loaded correctly. Fixes a particle crash in Inferno.

If a pspew specifies a single-frame image, be sure that it is loaded correctly.  Fixes a particle crash in Inferno.
@Goober5000 Goober5000 added fix A fix for bugs, not-a-bugs, and/or regressions. particles An item related to the particle system labels Sep 7, 2025
@Goober5000 Goober5000 added this to the Release 25.0 milestone Sep 7, 2025
@BMagnu BMagnu enabled auto-merge (squash) September 7, 2025 02:16
@BMagnu BMagnu merged commit fc10205 into scp-fs2open:master Sep 7, 2025
20 checks passed
@Goober5000 Goober5000 deleted the anim_fix branch September 7, 2025 02:50
wookieejedi added a commit to wookieejedi/fs2open.github.com that referenced this pull request Sep 17, 2025
From Sept 15 onward in fast debug I hit this error when using weapon create
ASSERTION: "cur_frame < part->nframes" at particle.cpp:371

Assert: "cur_frame < part->nframes"
File: particle.cpp
Line: 371

Thanks to lafiel, `that assert should have an `|| (part->nframes == 0 && cur_frame == 0) appended beaause while we need to stay inbounds for animations, frame 0 for both is valid for static images`
BMagnu pushed a commit that referenced this pull request Sep 17, 2025
From Sept 15 onward in fast debug I hit this error when using weapon create
ASSERTION: "cur_frame < part->nframes" at particle.cpp:371

Assert: "cur_frame < part->nframes"
File: particle.cpp
Line: 371

Thanks to lafiel, `that assert should have an `|| (part->nframes == 0 && cur_frame == 0) appended beaause while we need to stay inbounds for animations, frame 0 for both is valid for static images`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fix A fix for bugs, not-a-bugs, and/or regressions. particles An item related to the particle system

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants